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

Add package directive with fileName for InspectionTests to avoid names clashing

Browse Source
This commit is contained in:
Natalia Ukhorskaya
2014-04-28 13:47:19 +04:00
parent 335587c74e
commit 5a2f1ca65f
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/tests/org/jetbrains/jet/plugin/codeInsight/AbstractJetInspectionTest.kt
+13 -8
View File
@@ -49,23 +49,28 @@ public abstract class AbstractJetInspectionTest: LightCodeInsightFixtureTestCase
val inspectionsTestDir = optionsFile.getParentFile()!! val inspectionsTestDir = optionsFile.getParentFile()!!
val srcDir = inspectionsTestDir.getParentFile()!! val srcDir = inspectionsTestDir.getParentFile()!!
with(myFixture!!) { with(myFixture) {
setTestDataPath("${JetTestCaseBuilder.getHomeDirectory()}/$srcDir") setTestDataPath("${JetTestCaseBuilder.getHomeDirectory()}/$srcDir")
val virtualFiles = srcDir val psiFiles = srcDir
.listFiles { it.getName().endsWith(".kt") }!! .listFiles { it.getName().endsWith(".kt") }!!
.map { configureByFile(it.getName())!!.getVirtualFile()!! } .map {
file ->
val text = FileUtil.loadFile(file, true)
val fileText = if (text.startsWith("package")) text else "package ${file.getName().trimTrailing(".kt")};$text"
configureByText(file.getName(), fileText)!!
}
val isWithRuntime = virtualFiles.any({ file -> val isWithRuntime = psiFiles.any({ file ->
InTextDirectivesUtils.findStringWithPrefixes(String(file.contentsToByteArray(), "utf-8"), "// WITH_RUNTIME") != null InTextDirectivesUtils.findStringWithPrefixes(file.getText(), "// WITH_RUNTIME") != null
}) })
try { try {
if (isWithRuntime) { if (isWithRuntime) {
ConfigLibraryUtil.configureKotlinRuntime(myFixture!!.getModule(), getFullJavaJDK()); ConfigLibraryUtil.configureKotlinRuntime(myFixture.getModule(), getFullJavaJDK());
} }
val scope = AnalysisScope(getProject(), virtualFiles) val scope = AnalysisScope(getProject(), psiFiles.map { it.getVirtualFile()!! })
scope.invalidate() scope.invalidate()
val inspectionManager = (InspectionManager.getInstance(getProject()) as InspectionManagerEx) val inspectionManager = (InspectionManager.getInstance(getProject()) as InspectionManagerEx)
@@ -76,7 +81,7 @@ public abstract class AbstractJetInspectionTest: LightCodeInsightFixtureTestCase
} }
finally { finally {
if (isWithRuntime) { if (isWithRuntime) {
ConfigLibraryUtil.unConfigureKotlinRuntime(myFixture!!.getModule(), IdeaTestUtil.getMockJdk17()); ConfigLibraryUtil.unConfigureKotlinRuntime(myFixture.getModule(), IdeaTestUtil.getMockJdk17());
} }
} }
} }