From b530a30882de18f28c6fde9edbbfba61ded39001 Mon Sep 17 00:00:00 2001 From: Simon Ogorodnik Date: Tue, 7 Aug 2018 07:04:18 +0300 Subject: [PATCH] New J2K: Support different testData for new converter Sometimes old testData is incorrect --- .../j2k/AbstractJavaToKotlinConverterSingleFileTest.kt | 8 ++++++-- .../j2k/AbstractNewJavaToKotlinConverterSingleFileTest.kt | 5 +++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterSingleFileTest.kt b/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterSingleFileTest.kt index ee84f65d1da..93b977fcb0d 100644 --- a/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterSingleFileTest.kt +++ b/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterSingleFileTest.kt @@ -78,12 +78,16 @@ abstract class AbstractJavaToKotlinConverterSingleFileTest : AbstractJavaToKotli actual = createKotlinFile(actual).dumpTextWithErrors() } - val kotlinPath = javaPath.replace(".java", ".kt") - val expectedFile = File(kotlinPath) + val expectedFile = provideExpectedFile(javaPath) compareResults(expectedFile, actual) } + open fun provideExpectedFile(javaPath: String): File { + val kotlinPath = javaPath.replace(".java", ".kt") + return File(kotlinPath) + } + open fun compareResults(expectedFile: File, actual: String) { KotlinTestUtils.assertEqualsToFile(expectedFile, actual) } diff --git a/j2k/tests/org/jetbrains/kotlin/j2k/AbstractNewJavaToKotlinConverterSingleFileTest.kt b/j2k/tests/org/jetbrains/kotlin/j2k/AbstractNewJavaToKotlinConverterSingleFileTest.kt index ecb95455709..62fde2f1071 100644 --- a/j2k/tests/org/jetbrains/kotlin/j2k/AbstractNewJavaToKotlinConverterSingleFileTest.kt +++ b/j2k/tests/org/jetbrains/kotlin/j2k/AbstractNewJavaToKotlinConverterSingleFileTest.kt @@ -21,6 +21,7 @@ import com.intellij.openapi.project.Project import org.jetbrains.kotlin.idea.j2k.IdeaNewJavaToKotlinServices import org.jetbrains.kotlin.idea.j2k.J2kPostProcessor import org.jetbrains.kotlin.psi.KtPsiFactory +import java.io.File abstract class AbstractNewJavaToKotlinConverterSingleFileTest : AbstractJavaToKotlinConverterSingleFileTest() { @@ -39,4 +40,8 @@ abstract class AbstractNewJavaToKotlinConverterSingleFileTest : AbstractJavaToKo it.text }.single() } + + override fun provideExpectedFile(javaPath: String): File = + File(javaPath.replace(".java", ".new.kt")).takeIf { it.exists() } + ?: super.provideExpectedFile(javaPath) } \ No newline at end of file