FIR IDE: Add ability in test infra to have a "before" file different in
FIR vs FE1.0, and made file naming convention more consistent.
This commit is contained in:
committed by
Ilya Kirillov
parent
efa3bf9c69
commit
9e01a608b2
+14
-3
@@ -14,18 +14,29 @@ import java.nio.file.Paths
|
|||||||
|
|
||||||
abstract class AbstractHighLevelQuickFixTest : AbstractQuickFixTest() {
|
abstract class AbstractHighLevelQuickFixTest : AbstractQuickFixTest() {
|
||||||
override fun doTest(beforeFileName: String) {
|
override fun doTest(beforeFileName: String) {
|
||||||
|
val firBeforeFileName = getFirBeforeFileName(beforeFileName)
|
||||||
IgnoreTests.runTestIfNotDisabledByFileDirective(
|
IgnoreTests.runTestIfNotDisabledByFileDirective(
|
||||||
Paths.get(beforeFileName),
|
Paths.get(firBeforeFileName),
|
||||||
disableTestDirective = IgnoreTests.DIRECTIVES.IGNORE_FIR_MULTILINE_COMMENT,
|
disableTestDirective = IgnoreTests.DIRECTIVES.IGNORE_FIR_MULTILINE_COMMENT,
|
||||||
directivePosition = IgnoreTests.DirectivePosition.LAST_LINE_IN_FILE,
|
directivePosition = IgnoreTests.DirectivePosition.LAST_LINE_IN_FILE,
|
||||||
additionalFilesExtensions = arrayOf("after")
|
additionalFilesExtensions = arrayOf("after")
|
||||||
) {
|
) {
|
||||||
super.doTest(beforeFileName)
|
super.doTest(firBeforeFileName)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun getFirBeforeFileName(beforeFileName: String): String {
|
||||||
|
val firBeforeFilename = beforeFileName.replace(".kt", ".fir.kt")
|
||||||
|
val firBeforeFile = File(firBeforeFilename)
|
||||||
|
return if (firBeforeFile.exists()) {
|
||||||
|
firBeforeFile.canonicalPath
|
||||||
|
} else {
|
||||||
|
beforeFileName
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun getAfterFileName(beforeFileName: String): String {
|
override fun getAfterFileName(beforeFileName: String): String {
|
||||||
val firAfterFile = File(testPath(beforeFileName + ".fir.after"))
|
val firAfterFile = File(testPath(beforeFileName.replace(".kt", ".fir.kt.after")))
|
||||||
return if (firAfterFile.exists()) {
|
return if (firAfterFile.exists()) {
|
||||||
firAfterFile.name
|
firAfterFile.name
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
Reference in New Issue
Block a user