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

Refactor intention test files enumerating, do not use deprecated filter method, which would get another behavior after dropping deprecated one.

Browse Source
This commit is contained in:
Ilya Gorbunov
2015-11-10 06:23:57 +03:00
parent be9b14545f
commit f06d521bfe
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractInspectionTest.kt
+5 -5
View File
@@ -71,13 +71,13 @@ public abstract class AbstractInspectionTest : KotlinLightCodeInsightFixtureTest
setTestDataPath("${KotlinTestUtils.getHomeDirectory()}/$srcDir") setTestDataPath("${KotlinTestUtils.getHomeDirectory()}/$srcDir")
val afterFiles = srcDir.listFiles { it.name == "inspectionData" }?.single()?.listFiles { it.extension == "after" } ?: emptyArray() val afterFiles = srcDir.listFiles { it.name == "inspectionData" }?.single()?.listFiles { it.extension == "after" } ?: emptyArray()
val psiFiles = srcDir.walkTopDown().filter { it.name != "inspectionData" }.map { val psiFiles = srcDir.walkTopDown().treeFilter { it.name != "inspectionData" }.map {
file -> file ->
if (file.isDirectory) { if (file.isDirectory) {
null null
} }
else if (file.extension != "kt") { else if (file.extension != "kt") {
val filePath = file.getPath().substringAfter(srcDir.getPath()).replace("\\", "/") val filePath = file.relativeTo(srcDir).replace('\\', '/')
configureByFile(filePath) configureByFile(filePath)
} }
else { else {
@@ -86,10 +86,10 @@ public abstract class AbstractInspectionTest : KotlinLightCodeInsightFixtureTest
if (text.startsWith("package")) if (text.startsWith("package"))
text text
else else
"package ${file.getName().removeSuffix(".kt")};$text" "package ${file.nameWithoutExtension};$text"
configureByText(file.getName(), fileText)!! configureByText(file.name, fileText)!!
} }
}.filterNotNull().toArrayList() }.filterNotNull().toList()
val isJs = srcDir.endsWith("js") val isJs = srcDir.endsWith("js")