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

Refactor AbstractInspectionTest to allow java files

Browse Source
This commit is contained in:
Natalia Ukhorskaya
2015-08-12 15:17:35 +03:00
parent ba48a5b7fc
commit ccb4abee95
1 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractJetInspectionTest.kt
+21 -15
View File
@@ -26,12 +26,11 @@ import com.intellij.openapi.util.io.FileUtil
import com.intellij.testFramework.IdeaTestUtil import com.intellij.testFramework.IdeaTestUtil
import com.intellij.testFramework.InspectionTestUtil import com.intellij.testFramework.InspectionTestUtil
import com.intellij.testFramework.LightProjectDescriptor import com.intellij.testFramework.LightProjectDescriptor
import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase
import com.intellij.testFramework.fixtures.impl.CodeInsightTestFixtureImpl import com.intellij.testFramework.fixtures.impl.CodeInsightTestFixtureImpl
import org.jetbrains.kotlin.idea.test.JetLightProjectDescriptor
import org.jetbrains.kotlin.idea.test.PluginTestCaseBase
import org.jetbrains.kotlin.idea.test.ConfigLibraryUtil import org.jetbrains.kotlin.idea.test.ConfigLibraryUtil
import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase
import org.jetbrains.kotlin.idea.test.JetLightProjectDescriptor
import org.jetbrains.kotlin.idea.test.PluginTestCaseBase
import org.jetbrains.kotlin.test.InTextDirectivesUtils import org.jetbrains.kotlin.test.InTextDirectivesUtils
import org.jetbrains.kotlin.test.JetTestUtils import org.jetbrains.kotlin.test.JetTestUtils
import java.io.File import java.io.File
@@ -67,18 +66,25 @@ public abstract class AbstractJetInspectionTest: JetLightCodeInsightFixtureTestC
with(myFixture) { with(myFixture) {
setTestDataPath("${JetTestUtils.getHomeDirectory()}/$srcDir") setTestDataPath("${JetTestUtils.getHomeDirectory()}/$srcDir")
val psiFiles = srcDir val psiFiles = srcDir.walkTopDown().filter { it.name != "inspectionData" }.map {
.listFiles { it.getName().endsWith(".kt") || it.getName().endsWith(".txt") || it.getName().endsWith(".xml") || it.getName().endsWith(".java") }!! file ->
.map { if (file.isDirectory) {
file -> null
val text = FileUtil.loadFile(file, true) }
val fileText = else if (file.extension != "kt") {
if (text.startsWith("package") || !file.getName().endsWith(".kt")) val filePath = file.getPath().substringAfter(srcDir.getPath()).replace("\\", "/")
text configureByFile(filePath)
else }
"package ${file.getName().removeSuffix(".kt")};$text" else {
configureByText(file.getName(), fileText)!! val text = FileUtil.loadFile(file, true)
} val fileText =
if (text.startsWith("package"))
text
else
"package ${file.getName().removeSuffix(".kt")};$text"
configureByText(file.getName(), fileText)!!
}
}.filterNotNull().toArrayList()
val isJs = srcDir.endsWith("js") val isJs = srcDir.endsWith("js")