azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

New J2K: use test data for nj2k conversion tests from nj2k tests data instead of old one

Browse Source
This commit is contained in:
Ilya Kirillov
2019-07-15 16:38:44 +03:00
parent 101a3a9420
commit 84872e064f
4 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/tests/org/jetbrains/kotlin/idea/conversion/copy/AbstractJavaToKotlinCopyPasteConversionTest.kt
+1 -1
View File
@@ -17,7 +17,7 @@ import java.io.File
import kotlin.test.assertEquals import kotlin.test.assertEquals
abstract class AbstractJavaToKotlinCopyPasteConversionTest : AbstractJ2kCopyPasteTest() { 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 private var oldEditorOptions: KotlinEditorOptions? = null
idea/tests/org/jetbrains/kotlin/idea/conversion/copy/AbstractTextJavaToKotlinCopyPasteConversionTest.kt
+1 -1
View File
@@ -15,7 +15,7 @@ import org.jetbrains.kotlin.test.KotlinTestUtils
import java.io.File import java.io.File
abstract class AbstractTextJavaToKotlinCopyPasteConversionTest : AbstractJ2kCopyPasteTest() { 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 private var oldEditorOptions: KotlinEditorOptions? = null
nj2k/tests/org/jetbrains/kotlin/nj2k/AbstractNewJavaToKotlinCopyPasteConversionTest.kt
+3
View File
@@ -6,7 +6,10 @@
package org.jetbrains.kotlin.nj2k package org.jetbrains.kotlin.nj2k
import org.jetbrains.kotlin.idea.conversion.copy.AbstractJavaToKotlinCopyPasteConversionTest import org.jetbrains.kotlin.idea.conversion.copy.AbstractJavaToKotlinCopyPasteConversionTest
import org.jetbrains.kotlin.test.KotlinTestUtils
abstract class AbstractNewJavaToKotlinCopyPasteConversionTest : AbstractJavaToKotlinCopyPasteConversionTest() { abstract class AbstractNewJavaToKotlinCopyPasteConversionTest : AbstractJavaToKotlinCopyPasteConversionTest() {
override val BASE_PATH = KotlinTestUtils.getHomeDirectory() + "/nj2k/testData/copyPaste"
override fun isNewJ2K(): Boolean = true override fun isNewJ2K(): Boolean = true
} }
nj2k/tests/org/jetbrains/kotlin/nj2k/AbstractTextJavaToKotlinCopyPasteConversionTest.kt
+3
View File
@@ -6,7 +6,10 @@
package org.jetbrains.kotlin.nj2k package org.jetbrains.kotlin.nj2k
import org.jetbrains.kotlin.idea.conversion.copy.AbstractTextJavaToKotlinCopyPasteConversionTest import org.jetbrains.kotlin.idea.conversion.copy.AbstractTextJavaToKotlinCopyPasteConversionTest
import org.jetbrains.kotlin.test.KotlinTestUtils
abstract class AbstractTextNewJavaToKotlinCopyPasteConversionTest : AbstractTextJavaToKotlinCopyPasteConversionTest() { abstract class AbstractTextNewJavaToKotlinCopyPasteConversionTest : AbstractTextJavaToKotlinCopyPasteConversionTest() {
override val BASE_PATH = KotlinTestUtils.getHomeDirectory() + "/nj2k/testData/copyPastePlainText"
override fun isNewJ2K(): Boolean = true override fun isNewJ2K(): Boolean = true
} }