[kotlin] Align K2 test data file names

#KTIJ-29583

GitOrigin-RevId: 150fae6655bde2c4b7120edf2223c3112a4f2121
This commit is contained in:
Vladimir Dolzhenko
2024-07-13 18:32:27 +00:00
committed by intellij-monorepo-bot
parent 2d5af22db1
commit f36778006d
165 changed files with 15 additions and 14 deletions
@@ -27,24 +27,24 @@ abstract class AbstractHighLevelQuickFixTest : AbstractQuickFixTest() {
override val disableTestDirective: String get() = IgnoreTests.DIRECTIVES.IGNORE_K2_MULTILINE_COMMENT
override fun doTest(beforeFileName: String) {
val firBeforeFileName = getFirBeforeFileName(beforeFileName)
super.doTest(firBeforeFileName)
val effectiveBeforeFileName = getK2BeforeFileName(beforeFileName)
super.doTest(effectiveBeforeFileName)
}
private fun getFirBeforeFileName(beforeFileName: String): String {
val firBeforeFilename = beforeFileName.replace(".kt", ".fir.kt")
val firBeforeFile = File(firBeforeFilename)
return if (firBeforeFile.exists()) {
firBeforeFile.canonicalPath
private fun getK2BeforeFileName(beforeFileName: String): String {
val beforeFilename = beforeFileName.replace(".kt", ".k2.kt")
val beforeFile = File(beforeFilename)
return if (beforeFile.exists()) {
beforeFile.canonicalPath
} else {
beforeFileName
}
}
override fun getAfterFileName(beforeFileName: String): String {
val firAfterFile = File(dataFilePath(beforeFileName.replace(".kt", ".fir.kt.after")))
return if (firAfterFile.exists()) {
firAfterFile.name
val afterFile = File(dataFilePath(beforeFileName.replace(".kt", ".k2.kt.after")))
return if (afterFile.exists()) {
afterFile.name
} else {
super.getAfterFileName(beforeFileName)
}
@@ -41,9 +41,9 @@ abstract class AbstractK2QuickFixTest : AbstractQuickFixTest() {
}
override fun getAfterFileName(beforeFileName: String): String {
val firAfterFile = File(dataFilePath(beforeFileName.replace(".kt", ".fir.kt.after")))
return if (firAfterFile.exists()) {
firAfterFile.name
val afterFile = File(dataFilePath(beforeFileName.replace(".kt", ".k2.kt.after")))
return if (afterFile.exists()) {
afterFile.name
} else {
super.getAfterFileName(beforeFileName)
}
@@ -26,6 +26,7 @@ import com.intellij.util.PathUtil
import com.intellij.util.ThrowableRunnable
import junit.framework.TestCase
import org.jetbrains.kotlin.idea.KotlinFileType
import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode
import org.jetbrains.kotlin.idea.base.test.IgnoreTests
import org.jetbrains.kotlin.idea.quickfix.utils.findInspectionFile
import org.jetbrains.kotlin.idea.test.*
@@ -271,7 +272,7 @@ abstract class AbstractQuickFixMultiFileTest : KotlinLightCodeInsightFixtureTest
private fun findAfterFile(fullPath: String): File {
val path = fullPath.replace(".before.Main.", ".before.")
val afterTokens = (if (isFirPlugin) arrayOf(".after.fir.") else arrayOf()) + ".after."
val afterTokens = (if (pluginMode == KotlinPluginMode.K2) arrayOf(".after.k2.") else arrayOf()) + ".after."
for (afterToken in afterTokens) {
val file = File(path.replace(".before.", afterToken))
if (file.exists()) return file

Some files were not shown because too many files have changed in this diff Show More