From aa43bebbf1b77997f0de18b0e9c3fd91f8bdc988 Mon Sep 17 00:00:00 2001 From: Nicolay Mitropolsky Date: Fri, 27 Oct 2017 19:46:16 +0300 Subject: [PATCH] SpringTestFixtureExtension: option to forbid facet autoconfigure added --- .../unconfiguredFacet/inspectionData/inspections.test | 3 ++- .../kotlin/idea/spring/tests/SpringTestFixtureExtension.kt | 7 +++++++ .../tests/inspections/AbstractSpringInspectionTest.kt | 2 ++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ultimate/testData/inspections/spring/unconfiguredFacet/inspectionData/inspections.test b/ultimate/testData/inspections/spring/unconfiguredFacet/inspectionData/inspections.test index 5b39763229b..fb5dcfc78a1 100644 --- a/ultimate/testData/inspections/spring/unconfiguredFacet/inspectionData/inspections.test +++ b/ultimate/testData/inspections/spring/unconfiguredFacet/inspectionData/inspections.test @@ -1,2 +1,3 @@ // INSPECTION_CLASS: org.jetbrains.kotlin.idea.spring.inspections.KotlinSpringFacetCodeInspection -// FIXTURE_CLASS: org.jetbrains.kotlin.idea.spring.tests.SpringTestFixtureExtension \ No newline at end of file +// FIXTURE_CLASS: org.jetbrains.kotlin.idea.spring.tests.SpringTestFixtureExtension +// FORBID_SPRING_FILE_SET_AUTOCONFIGURE \ No newline at end of file diff --git a/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/SpringTestFixtureExtension.kt b/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/SpringTestFixtureExtension.kt index e593ccd228b..69c99044644 100644 --- a/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/SpringTestFixtureExtension.kt +++ b/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/SpringTestFixtureExtension.kt @@ -18,10 +18,12 @@ package org.jetbrains.kotlin.idea.spring.tests import com.intellij.facet.impl.FacetUtil import com.intellij.openapi.module.Module +import com.intellij.openapi.project.Project import com.intellij.openapi.util.io.FileUtil import com.intellij.psi.PsiFile import com.intellij.spring.facet.SpringFacet import com.intellij.spring.facet.SpringFileSet +import com.intellij.spring.settings.SpringGeneralSettings import com.intellij.testFramework.fixtures.CodeInsightTestFixture import com.intellij.testFramework.fixtures.JavaCodeInsightTestFixture import com.intellij.util.PathUtil @@ -97,4 +99,9 @@ fun configureSpringFileSetByDirective(module: Module, directives: String, psiFil if (!InTextDirectivesUtils.isDirectiveDefined(directives, "// CONFIGURE_SPRING_FILE_SET")) return val fileSet = SpringFacet.getInstance(module)!!.addFileSet("default", "default")!! psiFiles.forEach { fileSet.addFile(it.virtualFile) } +} + +fun forbidSpringFileSetAutoConfigureByDirective(project: Project, directives: String) { + if (!InTextDirectivesUtils.isDirectiveDefined(directives, "// FORBID_SPRING_FILE_SET_AUTOCONFIGURE")) return + SpringGeneralSettings.getInstance(project).isAllowAutoConfigurationMode = false } \ No newline at end of file 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 2db33c7d35f..00c6269a4b9 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 @@ -3,12 +3,14 @@ package org.jetbrains.kotlin.idea.spring.tests.inspections import com.intellij.psi.PsiFile import org.jetbrains.kotlin.idea.codeInsight.AbstractInspectionTest import org.jetbrains.kotlin.idea.spring.tests.configureSpringFileSetByDirective +import org.jetbrains.kotlin.idea.spring.tests.forbidSpringFileSetAutoConfigureByDirective abstract class AbstractSpringInspectionTest : AbstractInspectionTest() { override val forceUsePackageFolder: Boolean = true override fun configExtra(psiFiles: List, options: String) { + forbidSpringFileSetAutoConfigureByDirective(project, options) configureSpringFileSetByDirective(myFixture.module, options, psiFiles) } } \ No newline at end of file