From f7a1c71b540c8a45032d111b03d66e3229ed119c Mon Sep 17 00:00:00 2001 From: Nicolay Mitropolsky Date: Thu, 27 Jul 2017 18:26:44 +0300 Subject: [PATCH] Ultimate tests repair: SpringInspectionTestGenerated.testAutowiring_inspectionData_Inspections_test (KT-18847) --- .../codeInsight/AbstractInspectionTest.kt | 16 ++++++-- .../autowiring/inspectionData/expected.xml | 39 +++++++------------ .../AbstractSpringInspectionTest.kt | 3 ++ 3 files changed, 29 insertions(+), 29 deletions(-) diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractInspectionTest.kt b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractInspectionTest.kt index 0b0beba3405..91e1573b7cf 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractInspectionTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractInspectionTest.kt @@ -20,8 +20,6 @@ import com.intellij.codeInspection.ex.EntryPointsManagerBase import com.intellij.openapi.command.CommandProcessor import com.intellij.openapi.util.io.FileUtil import com.intellij.psi.PsiFile -import com.intellij.testFramework.IdeaTestUtil -import com.intellij.testFramework.LightProjectDescriptor import org.jetbrains.kotlin.idea.inspections.runInspection import org.jetbrains.kotlin.idea.test.* import org.jetbrains.kotlin.idea.util.application.runWriteAction @@ -49,6 +47,8 @@ abstract class AbstractInspectionTest : KotlinLightCodeInsightFixtureTestCase() } + protected open val forceUsePackageFolder: Boolean = false //workaround for IDEA-176033 + protected fun doTest(path: String) { val optionsFile = File(path) val options = FileUtil.loadFile(optionsFile, true) @@ -74,7 +74,17 @@ abstract class AbstractInspectionTest : KotlinLightCodeInsightFixtureTestCase() text else "package ${file.nameWithoutExtension};$text" - configureByText(file.name, fileText)!! + if (forceUsePackageFolder) { + val packageName = fileText.substring( + "package".length, + fileText.indexOfAny(charArrayOf(';', '\n')) + ).trim() + val projectFileName = packageName.replace('.', '/') + "/" + file.name + addFileToProject(projectFileName, fileText) + } + else { + configureByText(file.name, fileText)!! + } } file.extension == "gradle" -> { val text = FileUtil.loadFile(file, true) diff --git a/ultimate/testData/inspections/spring/autowiring/inspectionData/expected.xml b/ultimate/testData/inspections/spring/autowiring/inspectionData/expected.xml index 7ef28a95065..968b0f33f60 100644 --- a/ultimate/testData/inspections/spring/autowiring/inspectionData/expected.xml +++ b/ultimate/testData/inspections/spring/autowiring/inspectionData/expected.xml @@ -2,16 +2,14 @@ ambiguousConstructors.kt 52 - light_idea_test_case - + Autowiring for Bean Class (Kotlin) Class doesn't contain matching constructor for autowiring ambiguousConstructors.kt 58 - light_idea_test_case - + Autowiring for Bean Class (Kotlin) Class doesn't contain matching constructor for autowiring @@ -19,32 +17,28 @@ multipleAutowiredConstructors.kt 30 - light_idea_test_case - + Autowiring for Bean Class (Kotlin) Only one constructor can have @Autowired annotation multipleAutowiredConstructors.kt 31 - light_idea_test_case - + Autowiring for Bean Class (Kotlin) Only one constructor can have @Autowired annotation multipleAutowiredConstructors.kt 35 - light_idea_test_case - + Autowiring for Bean Class (Kotlin) Only one constructor can have @Autowired annotation multipleAutowiredConstructors.kt 36 - light_idea_test_case - + Autowiring for Bean Class (Kotlin) Only one constructor can have @Autowired annotation @@ -52,16 +46,14 @@ invalidAutowiredResource.kt 24 - light_idea_test_case - + Autowiring for Bean Class (Kotlin) Could not autowire. Bean should be of 'invalidAutowiredResource.BarBean' type invalidAutowiredResource.kt 31 - light_idea_test_case - + Autowiring for Bean Class (Kotlin) Cannot resolve bean 'fooBeannn' @@ -69,24 +61,21 @@ invalidAutowiredQualifier.kt 23 - light_idea_test_case - + Autowiring for Bean Class (Kotlin) Could not autowire. Qualified bean must be of 'BarBean' type. invalidAutowiredQualifier.kt 30 - light_idea_test_case - + Autowiring for Bean Class (Kotlin) Cannot find bean with qualifier 'fooBeannn' invalidAutowiredQualifier.kt 37 - light_idea_test_case - + Autowiring for Bean Class (Kotlin) Cannot find bean qualified with @Qualifier @@ -94,16 +83,14 @@ invalidAutowiredByType.kt 23 - light_idea_test_case - + Autowiring for Bean Class (Kotlin) Could not autowire. No beans of 'String' type found. invalidAutowiredByType.kt 29 - light_idea_test_case - + Autowiring for Bean Class (Kotlin) <html><table><tr><td>Could not autowire. There is more than one bean of 'AbstractBarBean' type.</td></tr><tr><td><table><tr><td valign='top'>Beans:</td><td>abstractBarBean&nbsp;&nbsp; (invalidAutowiredByType.kt)<br>barBean1&nbsp;&nbsp; (invalidAutowiredByType.kt)<br>barBean2&nbsp;&nbsp; (invalidAutowiredByType.kt)<br></td></tr></table></td></tr></table></html> diff --git a/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/inspections/AbstractSpringInspectionTest.kt b/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/inspections/AbstractSpringInspectionTest.kt index 183dab2287e..2db33c7d35f 100644 --- a/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/inspections/AbstractSpringInspectionTest.kt +++ b/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/inspections/AbstractSpringInspectionTest.kt @@ -5,6 +5,9 @@ import org.jetbrains.kotlin.idea.codeInsight.AbstractInspectionTest import org.jetbrains.kotlin.idea.spring.tests.configureSpringFileSetByDirective abstract class AbstractSpringInspectionTest : AbstractInspectionTest() { + + override val forceUsePackageFolder: Boolean = true + override fun configExtra(psiFiles: List, options: String) { configureSpringFileSetByDirective(myFixture.module, options, psiFiles) }