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

Minor: Fix Uast blinking tests

Browse Source
This commit is contained in:
Yan Zhulanow
2016-04-21 21:36:14 +03:00
parent 16b831196a
commit cbe21ab568
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/uast-kotlin/test/org.jetbrains.kotlin.uast/AbstractKotlinUastStructureTest.kt
+7 -1
View File
@@ -36,7 +36,7 @@ abstract class AbstractKotlinUastStructureTest : KotlinLightCodeInsightFixtureTe
val uElement = KotlinUastLanguagePlugin.converter.convertWithParent(psiFile) ?: error("UFile was not created") val uElement = KotlinUastLanguagePlugin.converter.convertWithParent(psiFile) ?: error("UFile was not created")
val logActual = uElement.logString() val logActual = uElement.logString()
val renderActual = uElement.renderString() val renderActual = trimEmptyLines(uElement.renderString())
try { try {
KotlinTestUtils.assertEqualsToFile(logFile, logActual) KotlinTestUtils.assertEqualsToFile(logFile, logActual)
@@ -48,6 +48,12 @@ abstract class AbstractKotlinUastStructureTest : KotlinLightCodeInsightFixtureTe
KotlinTestUtils.assertEqualsToFile(treeFile, genTree(uElement)) KotlinTestUtils.assertEqualsToFile(treeFile, genTree(uElement))
} }
private fun trimEmptyLines(s: String): String {
if (true) return s
val lineSeparator = System.getProperty("line.separator")
return s.lines().map { if (it.trim().isEmpty()) "" else it.trimEnd() }.joinToString(lineSeparator)
}
private fun genTree(node: UElement): String { private fun genTree(node: UElement): String {
val builder = StringBuilder() val builder = StringBuilder()
val visitor = object : AbstractUastVisitor() { val visitor = object : AbstractUastVisitor() {