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

Fix AbstractGenerateSpringDependencyActionTest.kt in branch 172

Browse Source
This commit is contained in:
Nikolay Krasko
2017-08-09 19:35:57 +03:00
parent 10bf49118a
commit 6d66fb35d6
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/tests/org/jetbrains/kotlin/idea/codeInsight/generate/AbstractCodeInsightActionTest.kt
+5 -4
View File
@@ -43,8 +43,8 @@ abstract class AbstractCodeInsightActionTest : KotlinLightCodeInsightFixtureTest
return Class.forName(actionClassName).newInstance() as CodeInsightAction
}
protected open fun configureExtra(mainFilePath: String, mainFileText: String) {
protected open fun configure(mainFilePath: String, mainFileText: String) {
myFixture.configureByFile(mainFilePath) as KtFile
}
protected open fun checkExtra() {
@@ -82,8 +82,9 @@ abstract class AbstractCodeInsightActionTest : KotlinLightCodeInsightFixtureTest
.forEach {
myFixture.configureByFile(File(rootDir, it).path.replace(File.separator, "/"))
}
configureExtra(path, fileText)
mainPsiFile = myFixture.configureByFile(path) as KtFile
configure(path, fileText)
mainPsiFile = myFixture.file as KtFile
val targetPlatformName = InTextDirectivesUtils.findStringWithPrefixes(fileText, "// PLATFORM: ")
if (targetPlatformName != null) {
ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/generate/AbstractGenerateSpringDependencyActionTest.kt
+5 -2
View File
@@ -36,16 +36,17 @@ abstract class AbstractGenerateSpringDependencyActionTest : AbstractCodeInsightA
TestFixtureExtension.loadFixture<SpringTestFixtureExtension>(myModule)
}
override fun configureExtra(mainFilePath: String, mainFileText: String) {
override fun configure(mainFilePath: String, mainFileText: String) {
val packagePath = mainFileText.lines().let { it.find { it.trim().startsWith("package") } }
?.removePrefix("package")
?.trim()?.replace(".", "/") ?: ""
val mainFilePathInProject = packagePath + "/" + File(mainFilePath).name
myFixture.addFileToProject(mainFilePathInProject, mainFileText)
val mainFileVirtualFile = myFixture.copyFileToProject(mainFilePath, mainFilePathInProject)
configFilePath = InTextDirectivesUtils.findStringWithPrefixes(mainFileText, "// CONFIG_FILE: ")?.let {
"${PathUtil.getParentPath(mainFilePath)}/$it"
} ?: mainFilePathInProject
val springFileSet = TestFixtureExtension
.getFixture<SpringTestFixtureExtension>()!!
.configureFileSet(myFixture, listOf(configFilePath!!))
@@ -55,6 +56,8 @@ abstract class AbstractGenerateSpringDependencyActionTest : AbstractCodeInsightA
val beansToChoose = InTextDirectivesUtils.findListWithPrefixes(mainFileText, "// CHOOSE_BEAN: ")
project.beanFilter = { it.name in beansToChoose }
myFixture.configureFromExistingVirtualFile(mainFileVirtualFile)
}
override fun checkExtra() {