From ccb4abee959656d95afc6715f0e418c282298e5c Mon Sep 17 00:00:00 2001
From: Natalia Ukhorskaya <natalia.ukhorskaya@jetbrains.com>
Date: Wed, 12 Aug 2015 15:17:35 +0300
Subject: [PATCH] Refactor AbstractInspectionTest to allow java files

---
 .../codeInsight/AbstractJetInspectionTest.kt  | 36 +++++++++++--------
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractJetInspectionTest.kt b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractJetInspectionTest.kt
index 21e12d49edc..b42cfda6f99 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractJetInspectionTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractJetInspectionTest.kt
@@ -26,12 +26,11 @@ import com.intellij.openapi.util.io.FileUtil
 import com.intellij.testFramework.IdeaTestUtil
 import com.intellij.testFramework.InspectionTestUtil
 import com.intellij.testFramework.LightProjectDescriptor
-import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase
 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.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.JetTestUtils
 import java.io.File
@@ -67,18 +66,25 @@ public abstract class AbstractJetInspectionTest: JetLightCodeInsightFixtureTestC
         with(myFixture) {
             setTestDataPath("${JetTestUtils.getHomeDirectory()}/$srcDir")
 
-            val psiFiles = srcDir
-                    .listFiles { it.getName().endsWith(".kt") || it.getName().endsWith(".txt") || it.getName().endsWith(".xml") || it.getName().endsWith(".java") }!!
-                    .map {
-                        file ->
-                        val text = FileUtil.loadFile(file, true)
-                        val fileText =
-                                if (text.startsWith("package") || !file.getName().endsWith(".kt"))
-                                    text
-                                else
-                                    "package ${file.getName().removeSuffix(".kt")};$text"
-                        configureByText(file.getName(), fileText)!!
-                    }
+            val psiFiles = srcDir.walkTopDown().filter { it.name != "inspectionData" }.map {
+                file ->
+                if (file.isDirectory) {
+                     null
+                }
+                else if (file.extension != "kt") {
+                    val filePath = file.getPath().substringAfter(srcDir.getPath()).replace("\\", "/")
+                    configureByFile(filePath)
+                }
+                else {
+                    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")