From a818d4714e6b05425a36fedb4bc0d498f04e74f2 Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Tue, 29 Mar 2016 17:08:10 +0300 Subject: [PATCH] Misc: Extract kotlin-ultimate project --- .gitignore | 8 + .idea/artifacts/KotlinPlugin.xml | 1 - .idea/modules.xml | 1 - ReadMe.md | 8 - generators/generators.iml | 1 - .../kotlin/generators/tests/GenerateTests.kt | 36 +- .../idea/completion/test/ideaTestUtils.kt | 1 + idea/idea-ultimate/idea-ultimate.iml | 53 --- idea/src/META-INF/plugin.xml | 8 +- ultimate/.gitignore | 8 + ultimate/.idea/.name | 1 + ultimate/.idea/ant.xml | 8 + ultimate/.idea/artifacts/Dummy.xml | 8 + ultimate/.idea/codeInsightSettings.xml | 8 + ultimate/.idea/compiler.xml | 16 +- ultimate/.idea/copyright/apache.xml | 9 + .../.idea/copyright/profiles_settings.xml | 3 + .../.idea/dictionaries/Nikolay_Krasko.xml | 24 + ultimate/.idea/dictionaries/abreslav.xml | 22 + ultimate/.idea/dictionaries/bashor.xml | 10 + ultimate/.idea/dictionaries/dzharkov.xml | 8 + ultimate/.idea/dictionaries/geevee.xml | 13 + ultimate/.idea/dictionaries/max.xml | 9 + ultimate/.idea/dictionaries/valentin.xml | 25 + ultimate/.idea/encodings.xml | 2 +- .../.idea/inspectionProfiles/idea_default.xml | 426 ++++++++++++++++++ .../inspectionProfiles/profiles_settings.xml | 2 +- ultimate/.idea/kotlinc.xml | 6 + .../.idea}/libraries/css_support.xml | 0 .../.idea}/libraries/database_support.xml | 0 .../libraries/gradle_and_groovy_plugin.xml | 19 + ultimate/.idea/libraries/idea_full.xml | 19 + ultimate/.idea/libraries/intellij_core.xml | 18 + ultimate/.idea/libraries/java_i18n.xml | 14 + .../.idea}/libraries/javaee_support.xml | 0 ultimate/.idea/libraries/javax_inject.xml | 11 + .../.idea}/libraries/jsp_support.xml | 0 ultimate/.idea/libraries/junit_plugin.xml | 15 + ultimate/.idea/libraries/kotlin_reflect.xml | 9 + ultimate/.idea/libraries/kotlin_runtime.xml | 13 + .../libraries/main_project_production.xml | 99 ++++ .../.idea/libraries/main_project_tests.xml | 21 + .../.idea}/libraries/persistence_support.xml | 0 ultimate/.idea/libraries/properties.xml | 14 + .../.idea}/libraries/spring_support.xml | 0 ultimate/.idea/misc.xml | 49 +- ultimate/.idea/modules.xml | 8 + ultimate/.idea/projectCodeStyle.xml | 171 +++++++ .../runConfigurations/Generate_Tests.xml | 31 ++ ultimate/.idea/runConfigurations/IDEA.xml | 47 ++ .../IDEA__No_ProcessCanceledException_.xml | 28 ++ .../Ultimate_Plugin_Tests.xml | 39 ++ ultimate/.idea/uiDesigner.xml | 14 +- ultimate/.idea/vcs.xml | 21 + ultimate/build.xml | 49 ++ ultimate/kotlin-ultimate.iml | 31 ++ .../KotlinFinalClassOrFunSpring.html | 0 .../KotlinSpringFacetCode.html | 0 .../src/META-INF/kotlin-spring.xml | 0 ultimate/src/META-INF/ultimate-plugin.xml | 8 + .../idea/spring/el/KotlinSpringELInjector.kt | 0 ...GenerateKotlinAutowiredDependencyAction.kt | 0 ...enerateKotlinSpringBeanDependencyAction.kt | 0 ...rateKotlinSpringBeanXmlDependencyAction.kt | 0 .../generateAutowiredDependenciesUtils.kt | 0 .../generate/generateDependenciesUtils.kt | 0 .../KotlinFinalClassOrFunSpringInspection.kt | 0 .../KotlinSpringFacetCodeInspection.kt | 0 .../lineMarking/KotlinSpringClassAnnotator.kt | 0 .../KotlinSpringReferenceContributor.kt | 0 .../references/KtSpringBeanScopeReference.kt | 0 .../kotlin/idea/spring/springUtils.kt | 0 .../inspectionData/expected.xml | 0 .../inspectionData/inspections.test | 0 .../finalSpringAnnotatedDeclaration/test.kt | 0 .../inspectionData/expected.xml | 0 .../inspectionData/inspections.test | 0 .../spring/unconfiguredFacet/test.kt | 0 .../.inspection | 0 .../classWithComponentRuntime.kt | 0 .../classWithComponentRuntime.kt.after | 0 .../classWithConfigurationRuntime.kt | 0 .../classWithConfigurationRuntime.kt.after | 0 .../classWithCustomConfigurationRuntime.kt | 0 ...assWithCustomConfigurationRuntime.kt.after | 0 .../funWithBeanFinalClassRuntime.kt | 0 .../funWithBeanFinalClassRuntime.kt.after | 0 .../funWithBeanOpenClassRuntime.kt | 0 .../funWithBeanOpenClassRuntime.kt.after | 0 .../funWithCustomBeanFinalClassRuntime.kt | 0 ...unWithCustomBeanFinalClassRuntime.kt.after | 0 .../funWithCustomBeanOpenClassRuntime.kt | 0 ...funWithCustomBeanOpenClassRuntime.kt.after | 0 .../duplicatingPropertyAnnotationConfig.kt | 0 ...plicatingPropertyAnnotationConfig.kt.after | 0 .../duplicatingPropertyXmlConfig.kt | 0 .../duplicatingPropertyXmlConfig.kt.after | 0 .../multiplePropertiesAnnotationConfig.kt | 0 ...ultiplePropertiesAnnotationConfig.kt.after | 0 .../multiplePropertiesXmlConfig.kt | 0 .../multiplePropertiesXmlConfig.kt.after | 0 .../propertyWithQualifierAnnotationConfig.kt | 0 ...ertyWithQualifierAnnotationConfig.kt.after | 0 .../propertyWithQualifierXmlConfig.kt | 0 .../propertyWithQualifierXmlConfig.kt.after | 0 .../singlePropertyAnnotationConfig.kt | 0 .../singlePropertyAnnotationConfig.kt.after | 0 .../singlePropertyXmlConfig.kt | 0 .../singlePropertyXmlConfig.kt.after | 0 .../autowiredDependencies/spring-config.xml | 0 .../factoryBean-config.xml | 0 .../factoryBean-config.xml.after | 0 .../factoryBean.kt.after | 0 .../factoryBean.kt_disabled | 0 .../factoryMethod-config.xml | 0 .../factoryMethod-config.xml.after | 0 .../factoryMethod.kt.after | 0 .../factoryMethod.kt_disabled | 0 .../firstConstructor-config.xml | 0 .../firstConstructor-config.xml.after | 0 .../beanDependenciesByXml/firstConstructor.kt | 0 .../firstConstructor.kt.after | 0 .../primaryConstructorAddParam-config.xml | 0 ...rimaryConstructorAddParam-config.xml.after | 0 .../primaryConstructorAddParam.kt | 0 .../primaryConstructorAddParam.kt.after | 0 .../beanDependenciesByXml/property-config.xml | 0 .../property-config.xml.after | 0 .../beanDependenciesByXml/property.kt | 0 .../beanDependenciesByXml/property.kt.after | 0 .../secondaryConstructor-config.xml | 0 .../secondaryConstructor-config.xml.after | 0 .../secondaryConstructor.kt.after | 0 .../secondaryConstructor.kt_disabled | 0 .../secondaryConstructorAddParam-config.xml | 0 ...ondaryConstructorAddParam-config.xml.after | 0 .../secondaryConstructorAddParam.kt | 0 .../secondaryConstructorAddParam.kt.after | 0 .../beanDependenciesByXml/setter-config.xml | 0 .../setter-config.xml.after | 0 .../generate/beanDependenciesByXml/setter.kt | 0 .../beanDependenciesByXml/setter.kt.after | 0 .../gutter/autowiredBeanCandidates/Bean.kt | 0 .../autowiredBeanCandidates.test | 0 .../gutter/autowiredBeanCandidates/config.xml | 0 .../core/gutter/autowiredProperty/Bean.kt | 0 .../autowiredProperty/autowiredProperty.test | 0 .../core/gutter/autowiredProperty/config.xml | 0 .../core/gutter/autowiredSetter/Bean.kt | 0 .../autowiredSetter/autowiredSetter.test | 0 .../core/gutter/autowiredSetter/config.xml | 0 .../spring/core/gutter/classGutter/Bean.kt | 0 .../core/gutter/classGutter/classGutter.test | 0 .../spring/core/gutter/classGutter/config.xml | 0 .../AbstractBean.kt | 0 .../AbstractBeanInheritor.kt | 0 .../AbstractBeanInheritor2.kt | 0 ...assGutterAbstractShowMappedInheritors.test | 0 .../inheritors.xml | 0 .../spring/core/gutter/componentScan/Bean.kt | 0 .../gutter/componentScan/ComponentScan.kt | 0 .../componentScan/beans/MyController.kt | 0 .../componentScan/beans/ResourceGutter.kt | 0 .../gutter/componentScan/componentScan.test | 0 .../ContextBeanInjectionPoints.kt | 0 .../contextBeanInjectionPoints/FooBar.kt | 0 .../contextBeanInjectionPoints.test | 0 ...ContextBeanWithQualifierInjectionPoints.kt | 0 .../FooBar.kt | 0 ...ntextBeanWithQualifierInjectionPoints.test | 0 .../spring/core/gutter/innerBean/InnerBean.kt | 0 .../core/gutter/innerBean/innerBean.test | 0 .../core/gutter/innerBean/innerBeanGutter.xml | 0 .../methodTypeDefaultInitMethod/Bean.kt | 0 .../methodTypeDefaultInitMethod/config.xml | 0 .../methodTypeDefaultInitMethod.test | 0 .../core/gutter/methodTypeFactory/Bean.kt | 0 .../core/gutter/methodTypeFactory/config.xml | 0 .../methodTypeFactory/methodTypeFactory.test | 0 .../core/gutter/methodTypeInitMethod/Bean.kt | 0 .../gutter/methodTypeInitMethod/config.xml | 0 .../methodTypeInitMethod.test | 0 .../core/gutter/methodTypeMultiple/Bean.kt | 0 .../core/gutter/methodTypeMultiple/config.xml | 0 .../methodTypeMultiple.test | 0 .../BeanWithProperties.kt | 0 .../propertyGutter.xml | 0 .../propertyGutterForProperty.test | 0 .../BeanWithProperties.kt | 0 .../propertyGutter.xml | 0 .../propertyGutterForSetter.test | 0 .../spring/core/gutter/resourceGutter/Bean.kt | 0 .../core/gutter/resourceGutter/Resource.kt | 0 .../resourceGutter/beans/ResourceGutter.kt | 0 .../gutter/resourceGutter/resourceGutter.test | 0 .../gutter/resourceGutter/resourceGutter.xml | 0 .../completion/handler/scopeReference.kt | 0 .../handler/scopeReference.kt.after | 0 .../completion/handler/spring-config.xml | 0 .../handler/springBeanReferenceEnter.kt | 0 .../handler/springBeanReferenceEnter.kt.after | 0 .../handler/springBeanReferenceTab.kt | 0 .../handler/springBeanReferenceTab.kt.after | 0 .../completion/variants/scopeReference.kt | 0 .../completion/variants/spring-config.xml | 0 .../variants/springBeanReference.kt | 0 .../fileReferenceInClasspathResource.kt | 0 .../fileReferenceInClasspathResource.test.xml | 0 .../fileReferenceInClasspathXmlContext.kt | 0 ...ileReferenceInClasspathXmlContext.test.xml | 0 .../references/navigation/scopeReference.kt | 0 .../navigation/scopeReference_config.xml | 0 .../springBeanRefInFactoryContainsBean.kt | 0 ...ingBeanRefInFactoryContainsBean_config.xml | 0 .../springBeanRefInFactoryGetBean.kt | 0 .../springBeanRefInFactoryGetBean_config.xml | 0 .../navigation/springBeanRefInResource.kt | 0 .../springBeanRefInResource_config.xml | 0 .../springFactoryBeanRefInResource.kt | 0 .../springFactoryBeanRefInResource_config.xml | 0 .../UltimateInspectionTestGenerated.java | 10 +- .../UltimateQuickFixTestGenerated.java | 28 +- .../tests/SpringTestFixtureExtension.kt | 5 +- ...tractGenerateSpringDependencyActionTest.kt | 0 ...teSpringDependencyActionTestGenerated.java | 30 +- .../AbstractSpringClassAnnotatorTest.kt | 1 - .../SpringClassAnnotatorTestGenerated.java | 36 +- .../tests/gutter/springGutterTestUtils.kt | 0 ...actSpringReferenceCompletionHandlerTest.kt | 0 .../AbstractSpringReferenceCompletionTest.kt | 2 +- .../AbstractSpringReferenceNavigationTest.kt | 0 ...ferenceCompletionHandlerTestGenerated.java | 10 +- ...pringReferenceCompletionTestGenerated.java | 8 +- ...pringReferenceNavigationTestGenerated.java | 18 +- .../jetbrains/kotlin/tests/GenerateTests.kt | 60 +++ .../org/jetbrains/kotlin/tests/testUtils.kt | 22 + ultimate/update_dependencies.xml | 38 ++ update_dependencies.xml | 27 +- 238 files changed, 1562 insertions(+), 206 deletions(-) delete mode 100644 idea/idea-ultimate/idea-ultimate.iml create mode 100644 ultimate/.gitignore create mode 100644 ultimate/.idea/.name create mode 100644 ultimate/.idea/ant.xml create mode 100644 ultimate/.idea/artifacts/Dummy.xml create mode 100644 ultimate/.idea/codeInsightSettings.xml create mode 100644 ultimate/.idea/copyright/apache.xml create mode 100644 ultimate/.idea/dictionaries/Nikolay_Krasko.xml create mode 100644 ultimate/.idea/dictionaries/abreslav.xml create mode 100644 ultimate/.idea/dictionaries/bashor.xml create mode 100644 ultimate/.idea/dictionaries/dzharkov.xml create mode 100644 ultimate/.idea/dictionaries/geevee.xml create mode 100644 ultimate/.idea/dictionaries/max.xml create mode 100644 ultimate/.idea/dictionaries/valentin.xml create mode 100644 ultimate/.idea/inspectionProfiles/idea_default.xml create mode 100644 ultimate/.idea/kotlinc.xml rename {.idea => ultimate/.idea}/libraries/css_support.xml (100%) rename {.idea => ultimate/.idea}/libraries/database_support.xml (100%) create mode 100644 ultimate/.idea/libraries/gradle_and_groovy_plugin.xml create mode 100644 ultimate/.idea/libraries/idea_full.xml create mode 100644 ultimate/.idea/libraries/intellij_core.xml create mode 100644 ultimate/.idea/libraries/java_i18n.xml rename {.idea => ultimate/.idea}/libraries/javaee_support.xml (100%) create mode 100644 ultimate/.idea/libraries/javax_inject.xml rename {.idea => ultimate/.idea}/libraries/jsp_support.xml (100%) create mode 100644 ultimate/.idea/libraries/junit_plugin.xml create mode 100644 ultimate/.idea/libraries/kotlin_reflect.xml create mode 100644 ultimate/.idea/libraries/kotlin_runtime.xml create mode 100644 ultimate/.idea/libraries/main_project_production.xml create mode 100644 ultimate/.idea/libraries/main_project_tests.xml rename {.idea => ultimate/.idea}/libraries/persistence_support.xml (100%) create mode 100644 ultimate/.idea/libraries/properties.xml rename {.idea => ultimate/.idea}/libraries/spring_support.xml (100%) create mode 100644 ultimate/.idea/modules.xml create mode 100644 ultimate/.idea/projectCodeStyle.xml create mode 100644 ultimate/.idea/runConfigurations/Generate_Tests.xml create mode 100644 ultimate/.idea/runConfigurations/IDEA.xml create mode 100644 ultimate/.idea/runConfigurations/IDEA__No_ProcessCanceledException_.xml create mode 100644 ultimate/.idea/runConfigurations/Ultimate_Plugin_Tests.xml create mode 100644 ultimate/.idea/vcs.xml create mode 100644 ultimate/build.xml create mode 100644 ultimate/kotlin-ultimate.iml rename {idea/idea-ultimate => ultimate}/resources/inspectionDescriptions/KotlinFinalClassOrFunSpring.html (100%) rename {idea/idea-ultimate => ultimate}/resources/inspectionDescriptions/KotlinSpringFacetCode.html (100%) rename {idea/idea-ultimate => ultimate}/src/META-INF/kotlin-spring.xml (100%) create mode 100644 ultimate/src/META-INF/ultimate-plugin.xml rename {idea/idea-ultimate => ultimate}/src/org/jetbrains/kotlin/idea/spring/el/KotlinSpringELInjector.kt (100%) rename {idea/idea-ultimate => ultimate}/src/org/jetbrains/kotlin/idea/spring/generate/GenerateKotlinAutowiredDependencyAction.kt (100%) rename {idea/idea-ultimate => ultimate}/src/org/jetbrains/kotlin/idea/spring/generate/GenerateKotlinSpringBeanDependencyAction.kt (100%) rename {idea/idea-ultimate => ultimate}/src/org/jetbrains/kotlin/idea/spring/generate/GenerateKotlinSpringBeanXmlDependencyAction.kt (100%) rename {idea/idea-ultimate => ultimate}/src/org/jetbrains/kotlin/idea/spring/generate/generateAutowiredDependenciesUtils.kt (100%) rename {idea/idea-ultimate => ultimate}/src/org/jetbrains/kotlin/idea/spring/generate/generateDependenciesUtils.kt (100%) rename {idea/idea-ultimate => ultimate}/src/org/jetbrains/kotlin/idea/spring/inspections/KotlinFinalClassOrFunSpringInspection.kt (100%) rename {idea/idea-ultimate => ultimate}/src/org/jetbrains/kotlin/idea/spring/inspections/KotlinSpringFacetCodeInspection.kt (100%) rename {idea/idea-ultimate => ultimate}/src/org/jetbrains/kotlin/idea/spring/lineMarking/KotlinSpringClassAnnotator.kt (100%) rename {idea/idea-ultimate => ultimate}/src/org/jetbrains/kotlin/idea/spring/references/KotlinSpringReferenceContributor.kt (100%) rename {idea/idea-ultimate => ultimate}/src/org/jetbrains/kotlin/idea/spring/references/KtSpringBeanScopeReference.kt (100%) rename {idea/idea-ultimate => ultimate}/src/org/jetbrains/kotlin/idea/spring/springUtils.kt (100%) rename {idea/testData/ultimateInspections => ultimate/testData/inspections}/spring/finalSpringAnnotatedDeclaration/inspectionData/expected.xml (100%) rename {idea/testData/ultimateInspections => ultimate/testData/inspections}/spring/finalSpringAnnotatedDeclaration/inspectionData/inspections.test (100%) rename {idea/testData/ultimateInspections => ultimate/testData/inspections}/spring/finalSpringAnnotatedDeclaration/test.kt (100%) rename {idea/testData/ultimateInspections => ultimate/testData/inspections}/spring/unconfiguredFacet/inspectionData/expected.xml (100%) rename {idea/testData/ultimateInspections => ultimate/testData/inspections}/spring/unconfiguredFacet/inspectionData/inspections.test (100%) rename {idea/testData/ultimateInspections => ultimate/testData/inspections}/spring/unconfiguredFacet/test.kt (100%) rename {idea/testData/ultimateQuickFixes => ultimate/testData/quickFixes}/spring/finalSpringAnnotatedDeclaration/.inspection (100%) rename {idea/testData/ultimateQuickFixes => ultimate/testData/quickFixes}/spring/finalSpringAnnotatedDeclaration/classWithComponentRuntime.kt (100%) rename {idea/testData/ultimateQuickFixes => ultimate/testData/quickFixes}/spring/finalSpringAnnotatedDeclaration/classWithComponentRuntime.kt.after (100%) rename {idea/testData/ultimateQuickFixes => ultimate/testData/quickFixes}/spring/finalSpringAnnotatedDeclaration/classWithConfigurationRuntime.kt (100%) rename {idea/testData/ultimateQuickFixes => ultimate/testData/quickFixes}/spring/finalSpringAnnotatedDeclaration/classWithConfigurationRuntime.kt.after (100%) rename {idea/testData/ultimateQuickFixes => ultimate/testData/quickFixes}/spring/finalSpringAnnotatedDeclaration/classWithCustomConfigurationRuntime.kt (100%) rename {idea/testData/ultimateQuickFixes => ultimate/testData/quickFixes}/spring/finalSpringAnnotatedDeclaration/classWithCustomConfigurationRuntime.kt.after (100%) rename {idea/testData/ultimateQuickFixes => ultimate/testData/quickFixes}/spring/finalSpringAnnotatedDeclaration/funWithBeanFinalClassRuntime.kt (100%) rename {idea/testData/ultimateQuickFixes => ultimate/testData/quickFixes}/spring/finalSpringAnnotatedDeclaration/funWithBeanFinalClassRuntime.kt.after (100%) rename {idea/testData/ultimateQuickFixes => ultimate/testData/quickFixes}/spring/finalSpringAnnotatedDeclaration/funWithBeanOpenClassRuntime.kt (100%) rename {idea/testData/ultimateQuickFixes => ultimate/testData/quickFixes}/spring/finalSpringAnnotatedDeclaration/funWithBeanOpenClassRuntime.kt.after (100%) rename {idea/testData/ultimateQuickFixes => ultimate/testData/quickFixes}/spring/finalSpringAnnotatedDeclaration/funWithCustomBeanFinalClassRuntime.kt (100%) rename {idea/testData/ultimateQuickFixes => ultimate/testData/quickFixes}/spring/finalSpringAnnotatedDeclaration/funWithCustomBeanFinalClassRuntime.kt.after (100%) rename {idea/testData/ultimateQuickFixes => ultimate/testData/quickFixes}/spring/finalSpringAnnotatedDeclaration/funWithCustomBeanOpenClassRuntime.kt (100%) rename {idea/testData/ultimateQuickFixes => ultimate/testData/quickFixes}/spring/finalSpringAnnotatedDeclaration/funWithCustomBeanOpenClassRuntime.kt.after (100%) rename {idea => ultimate}/testData/spring/core/generate/autowiredDependencies/duplicatingPropertyAnnotationConfig.kt (100%) rename {idea => ultimate}/testData/spring/core/generate/autowiredDependencies/duplicatingPropertyAnnotationConfig.kt.after (100%) rename {idea => ultimate}/testData/spring/core/generate/autowiredDependencies/duplicatingPropertyXmlConfig.kt (100%) rename {idea => ultimate}/testData/spring/core/generate/autowiredDependencies/duplicatingPropertyXmlConfig.kt.after (100%) rename {idea => ultimate}/testData/spring/core/generate/autowiredDependencies/multiplePropertiesAnnotationConfig.kt (100%) rename {idea => ultimate}/testData/spring/core/generate/autowiredDependencies/multiplePropertiesAnnotationConfig.kt.after (100%) rename {idea => ultimate}/testData/spring/core/generate/autowiredDependencies/multiplePropertiesXmlConfig.kt (100%) rename {idea => ultimate}/testData/spring/core/generate/autowiredDependencies/multiplePropertiesXmlConfig.kt.after (100%) rename {idea => ultimate}/testData/spring/core/generate/autowiredDependencies/propertyWithQualifierAnnotationConfig.kt (100%) rename {idea => ultimate}/testData/spring/core/generate/autowiredDependencies/propertyWithQualifierAnnotationConfig.kt.after (100%) rename {idea => ultimate}/testData/spring/core/generate/autowiredDependencies/propertyWithQualifierXmlConfig.kt (100%) rename {idea => ultimate}/testData/spring/core/generate/autowiredDependencies/propertyWithQualifierXmlConfig.kt.after (100%) rename {idea => ultimate}/testData/spring/core/generate/autowiredDependencies/singlePropertyAnnotationConfig.kt (100%) rename {idea => ultimate}/testData/spring/core/generate/autowiredDependencies/singlePropertyAnnotationConfig.kt.after (100%) rename {idea => ultimate}/testData/spring/core/generate/autowiredDependencies/singlePropertyXmlConfig.kt (100%) rename {idea => ultimate}/testData/spring/core/generate/autowiredDependencies/singlePropertyXmlConfig.kt.after (100%) rename {idea => ultimate}/testData/spring/core/generate/autowiredDependencies/spring-config.xml (100%) rename {idea => ultimate}/testData/spring/core/generate/beanDependenciesByXml/factoryBean-config.xml (100%) rename {idea => ultimate}/testData/spring/core/generate/beanDependenciesByXml/factoryBean-config.xml.after (100%) rename {idea => ultimate}/testData/spring/core/generate/beanDependenciesByXml/factoryBean.kt.after (100%) rename {idea => ultimate}/testData/spring/core/generate/beanDependenciesByXml/factoryBean.kt_disabled (100%) rename {idea => ultimate}/testData/spring/core/generate/beanDependenciesByXml/factoryMethod-config.xml (100%) rename {idea => ultimate}/testData/spring/core/generate/beanDependenciesByXml/factoryMethod-config.xml.after (100%) rename {idea => ultimate}/testData/spring/core/generate/beanDependenciesByXml/factoryMethod.kt.after (100%) rename {idea => ultimate}/testData/spring/core/generate/beanDependenciesByXml/factoryMethod.kt_disabled (100%) rename {idea => ultimate}/testData/spring/core/generate/beanDependenciesByXml/firstConstructor-config.xml (100%) rename {idea => ultimate}/testData/spring/core/generate/beanDependenciesByXml/firstConstructor-config.xml.after (100%) rename {idea => ultimate}/testData/spring/core/generate/beanDependenciesByXml/firstConstructor.kt (100%) rename {idea => ultimate}/testData/spring/core/generate/beanDependenciesByXml/firstConstructor.kt.after (100%) rename {idea => ultimate}/testData/spring/core/generate/beanDependenciesByXml/primaryConstructorAddParam-config.xml (100%) rename {idea => ultimate}/testData/spring/core/generate/beanDependenciesByXml/primaryConstructorAddParam-config.xml.after (100%) rename {idea => ultimate}/testData/spring/core/generate/beanDependenciesByXml/primaryConstructorAddParam.kt (100%) rename {idea => ultimate}/testData/spring/core/generate/beanDependenciesByXml/primaryConstructorAddParam.kt.after (100%) rename {idea => ultimate}/testData/spring/core/generate/beanDependenciesByXml/property-config.xml (100%) rename {idea => ultimate}/testData/spring/core/generate/beanDependenciesByXml/property-config.xml.after (100%) rename {idea => ultimate}/testData/spring/core/generate/beanDependenciesByXml/property.kt (100%) rename {idea => ultimate}/testData/spring/core/generate/beanDependenciesByXml/property.kt.after (100%) rename {idea => ultimate}/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructor-config.xml (100%) rename {idea => ultimate}/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructor-config.xml.after (100%) rename {idea => ultimate}/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructor.kt.after (100%) rename {idea => ultimate}/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructor.kt_disabled (100%) rename {idea => ultimate}/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructorAddParam-config.xml (100%) rename {idea => ultimate}/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructorAddParam-config.xml.after (100%) rename {idea => ultimate}/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructorAddParam.kt (100%) rename {idea => ultimate}/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructorAddParam.kt.after (100%) rename {idea => ultimate}/testData/spring/core/generate/beanDependenciesByXml/setter-config.xml (100%) rename {idea => ultimate}/testData/spring/core/generate/beanDependenciesByXml/setter-config.xml.after (100%) rename {idea => ultimate}/testData/spring/core/generate/beanDependenciesByXml/setter.kt (100%) rename {idea => ultimate}/testData/spring/core/generate/beanDependenciesByXml/setter.kt.after (100%) rename {idea => ultimate}/testData/spring/core/gutter/autowiredBeanCandidates/Bean.kt (100%) rename {idea => ultimate}/testData/spring/core/gutter/autowiredBeanCandidates/autowiredBeanCandidates.test (100%) rename {idea => ultimate}/testData/spring/core/gutter/autowiredBeanCandidates/config.xml (100%) rename {idea => ultimate}/testData/spring/core/gutter/autowiredProperty/Bean.kt (100%) rename {idea => ultimate}/testData/spring/core/gutter/autowiredProperty/autowiredProperty.test (100%) rename {idea => ultimate}/testData/spring/core/gutter/autowiredProperty/config.xml (100%) rename {idea => ultimate}/testData/spring/core/gutter/autowiredSetter/Bean.kt (100%) rename {idea => ultimate}/testData/spring/core/gutter/autowiredSetter/autowiredSetter.test (100%) rename {idea => ultimate}/testData/spring/core/gutter/autowiredSetter/config.xml (100%) rename {idea => ultimate}/testData/spring/core/gutter/classGutter/Bean.kt (100%) rename {idea => ultimate}/testData/spring/core/gutter/classGutter/classGutter.test (100%) rename {idea => ultimate}/testData/spring/core/gutter/classGutter/config.xml (100%) rename {idea => ultimate}/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/AbstractBean.kt (100%) rename {idea => ultimate}/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/AbstractBeanInheritor.kt (100%) rename {idea => ultimate}/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/AbstractBeanInheritor2.kt (100%) rename {idea => ultimate}/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/classGutterAbstractShowMappedInheritors.test (100%) rename {idea => ultimate}/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/inheritors.xml (100%) rename {idea => ultimate}/testData/spring/core/gutter/componentScan/Bean.kt (100%) rename {idea => ultimate}/testData/spring/core/gutter/componentScan/ComponentScan.kt (100%) rename {idea => ultimate}/testData/spring/core/gutter/componentScan/beans/MyController.kt (100%) rename {idea => ultimate}/testData/spring/core/gutter/componentScan/beans/ResourceGutter.kt (100%) rename {idea => ultimate}/testData/spring/core/gutter/componentScan/componentScan.test (100%) rename {idea => ultimate}/testData/spring/core/gutter/contextBeanInjectionPoints/ContextBeanInjectionPoints.kt (100%) rename {idea => ultimate}/testData/spring/core/gutter/contextBeanInjectionPoints/FooBar.kt (100%) rename {idea => ultimate}/testData/spring/core/gutter/contextBeanInjectionPoints/contextBeanInjectionPoints.test (100%) rename {idea => ultimate}/testData/spring/core/gutter/contextBeanWithQualifierInjectionPoints/ContextBeanWithQualifierInjectionPoints.kt (100%) rename {idea => ultimate}/testData/spring/core/gutter/contextBeanWithQualifierInjectionPoints/FooBar.kt (100%) rename {idea => ultimate}/testData/spring/core/gutter/contextBeanWithQualifierInjectionPoints/contextBeanWithQualifierInjectionPoints.test (100%) rename {idea => ultimate}/testData/spring/core/gutter/innerBean/InnerBean.kt (100%) rename {idea => ultimate}/testData/spring/core/gutter/innerBean/innerBean.test (100%) rename {idea => ultimate}/testData/spring/core/gutter/innerBean/innerBeanGutter.xml (100%) rename {idea => ultimate}/testData/spring/core/gutter/methodTypeDefaultInitMethod/Bean.kt (100%) rename {idea => ultimate}/testData/spring/core/gutter/methodTypeDefaultInitMethod/config.xml (100%) rename {idea => ultimate}/testData/spring/core/gutter/methodTypeDefaultInitMethod/methodTypeDefaultInitMethod.test (100%) rename {idea => ultimate}/testData/spring/core/gutter/methodTypeFactory/Bean.kt (100%) rename {idea => ultimate}/testData/spring/core/gutter/methodTypeFactory/config.xml (100%) rename {idea => ultimate}/testData/spring/core/gutter/methodTypeFactory/methodTypeFactory.test (100%) rename {idea => ultimate}/testData/spring/core/gutter/methodTypeInitMethod/Bean.kt (100%) rename {idea => ultimate}/testData/spring/core/gutter/methodTypeInitMethod/config.xml (100%) rename {idea => ultimate}/testData/spring/core/gutter/methodTypeInitMethod/methodTypeInitMethod.test (100%) rename {idea => ultimate}/testData/spring/core/gutter/methodTypeMultiple/Bean.kt (100%) rename {idea => ultimate}/testData/spring/core/gutter/methodTypeMultiple/config.xml (100%) rename {idea => ultimate}/testData/spring/core/gutter/methodTypeMultiple/methodTypeMultiple.test (100%) rename {idea => ultimate}/testData/spring/core/gutter/propertyGutterForProperty/BeanWithProperties.kt (100%) rename {idea => ultimate}/testData/spring/core/gutter/propertyGutterForProperty/propertyGutter.xml (100%) rename {idea => ultimate}/testData/spring/core/gutter/propertyGutterForProperty/propertyGutterForProperty.test (100%) rename {idea => ultimate}/testData/spring/core/gutter/propertyGutterForSetter/BeanWithProperties.kt (100%) rename {idea => ultimate}/testData/spring/core/gutter/propertyGutterForSetter/propertyGutter.xml (100%) rename {idea => ultimate}/testData/spring/core/gutter/propertyGutterForSetter/propertyGutterForSetter.test (100%) rename {idea => ultimate}/testData/spring/core/gutter/resourceGutter/Bean.kt (100%) rename {idea => ultimate}/testData/spring/core/gutter/resourceGutter/Resource.kt (100%) rename {idea => ultimate}/testData/spring/core/gutter/resourceGutter/beans/ResourceGutter.kt (100%) rename {idea => ultimate}/testData/spring/core/gutter/resourceGutter/resourceGutter.test (100%) rename {idea => ultimate}/testData/spring/core/gutter/resourceGutter/resourceGutter.xml (100%) rename {idea => ultimate}/testData/spring/core/references/completion/handler/scopeReference.kt (100%) rename {idea => ultimate}/testData/spring/core/references/completion/handler/scopeReference.kt.after (100%) rename {idea => ultimate}/testData/spring/core/references/completion/handler/spring-config.xml (100%) rename {idea => ultimate}/testData/spring/core/references/completion/handler/springBeanReferenceEnter.kt (100%) rename {idea => ultimate}/testData/spring/core/references/completion/handler/springBeanReferenceEnter.kt.after (100%) rename {idea => ultimate}/testData/spring/core/references/completion/handler/springBeanReferenceTab.kt (100%) rename {idea => ultimate}/testData/spring/core/references/completion/handler/springBeanReferenceTab.kt.after (100%) rename {idea => ultimate}/testData/spring/core/references/completion/variants/scopeReference.kt (100%) rename {idea => ultimate}/testData/spring/core/references/completion/variants/spring-config.xml (100%) rename {idea => ultimate}/testData/spring/core/references/completion/variants/springBeanReference.kt (100%) rename {idea => ultimate}/testData/spring/core/references/navigation/fileReferenceInClasspathResource.kt (100%) rename {idea => ultimate}/testData/spring/core/references/navigation/fileReferenceInClasspathResource.test.xml (100%) rename {idea => ultimate}/testData/spring/core/references/navigation/fileReferenceInClasspathXmlContext.kt (100%) rename {idea => ultimate}/testData/spring/core/references/navigation/fileReferenceInClasspathXmlContext.test.xml (100%) rename {idea => ultimate}/testData/spring/core/references/navigation/scopeReference.kt (100%) rename {idea => ultimate}/testData/spring/core/references/navigation/scopeReference_config.xml (100%) rename {idea => ultimate}/testData/spring/core/references/navigation/springBeanRefInFactoryContainsBean.kt (100%) rename {idea => ultimate}/testData/spring/core/references/navigation/springBeanRefInFactoryContainsBean_config.xml (100%) rename {idea => ultimate}/testData/spring/core/references/navigation/springBeanRefInFactoryGetBean.kt (100%) rename {idea => ultimate}/testData/spring/core/references/navigation/springBeanRefInFactoryGetBean_config.xml (100%) rename {idea => ultimate}/testData/spring/core/references/navigation/springBeanRefInResource.kt (100%) rename {idea => ultimate}/testData/spring/core/references/navigation/springBeanRefInResource_config.xml (100%) rename {idea => ultimate}/testData/spring/core/references/navigation/springFactoryBeanRefInResource.kt (100%) rename {idea => ultimate}/testData/spring/core/references/navigation/springFactoryBeanRefInResource_config.xml (100%) rename {idea/idea-ultimate => ultimate}/tests/org/jetbrains/kotlin/idea/codeInsight/UltimateInspectionTestGenerated.java (75%) rename {idea/idea-ultimate => ultimate}/tests/org/jetbrains/kotlin/idea/quickfix/UltimateQuickFixTestGenerated.java (72%) rename {idea/idea-ultimate => ultimate}/tests/org/jetbrains/kotlin/idea/spring/tests/SpringTestFixtureExtension.kt (93%) rename {idea/idea-ultimate => ultimate}/tests/org/jetbrains/kotlin/idea/spring/tests/generate/AbstractGenerateSpringDependencyActionTest.kt (100%) rename {idea/idea-ultimate => ultimate}/tests/org/jetbrains/kotlin/idea/spring/tests/generate/GenerateSpringDependencyActionTestGenerated.java (64%) rename {idea/idea-ultimate => ultimate}/tests/org/jetbrains/kotlin/idea/spring/tests/gutter/AbstractSpringClassAnnotatorTest.kt (98%) rename {idea/idea-ultimate => ultimate}/tests/org/jetbrains/kotlin/idea/spring/tests/gutter/SpringClassAnnotatorTestGenerated.java (63%) rename {idea/idea-ultimate => ultimate}/tests/org/jetbrains/kotlin/idea/spring/tests/gutter/springGutterTestUtils.kt (100%) rename {idea/idea-ultimate => ultimate}/tests/org/jetbrains/kotlin/idea/spring/tests/references/AbstractSpringReferenceCompletionHandlerTest.kt (100%) rename {idea/idea-ultimate => ultimate}/tests/org/jetbrains/kotlin/idea/spring/tests/references/AbstractSpringReferenceCompletionTest.kt (99%) rename {idea/idea-ultimate => ultimate}/tests/org/jetbrains/kotlin/idea/spring/tests/references/AbstractSpringReferenceNavigationTest.kt (100%) rename {idea/idea-ultimate => ultimate}/tests/org/jetbrains/kotlin/idea/spring/tests/references/SpringReferenceCompletionHandlerTestGenerated.java (74%) rename {idea/idea-ultimate => ultimate}/tests/org/jetbrains/kotlin/idea/spring/tests/references/SpringReferenceCompletionTestGenerated.java (77%) rename {idea/idea-ultimate => ultimate}/tests/org/jetbrains/kotlin/idea/spring/tests/references/SpringReferenceNavigationTestGenerated.java (67%) create mode 100644 ultimate/tests/org/jetbrains/kotlin/tests/GenerateTests.kt create mode 100644 ultimate/tests/org/jetbrains/kotlin/tests/testUtils.kt create mode 100644 ultimate/update_dependencies.xml diff --git a/.gitignore b/.gitignore index 1aad52983e4..e6eef81b84e 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,11 @@ workspace.xml *.versionsBackup /idea/testData/debugger/tinyApp/classes* /jps-plugin/testData/kannotator +ultimate/.DS_Store +ultimate/.idea/shelf +ultimate/dependencies +ultimate/ideaSDK +ultimate/out +ultimate/tmp +ultimate/workspace.xml +ultimate/*.versionsBackup diff --git a/.idea/artifacts/KotlinPlugin.xml b/.idea/artifacts/KotlinPlugin.xml index c37a9990918..1eb3897786f 100644 --- a/.idea/artifacts/KotlinPlugin.xml +++ b/.idea/artifacts/KotlinPlugin.xml @@ -47,7 +47,6 @@ - diff --git a/.idea/modules.xml b/.idea/modules.xml index ecfd35f4f91..a6a8109750f 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -47,7 +47,6 @@ - diff --git a/ReadMe.md b/ReadMe.md index 437b5fa924e..b15bf23a922 100644 --- a/ReadMe.md +++ b/ReadMe.md @@ -34,11 +34,6 @@ which will setup the dependencies on * intellij-core: is a part of command line compiler and contains only necessary APIs. * idea-full: is a full blown IntelliJ IDEA Community Edition to be used in former plugin module. -* idea-ultimate-full: is a full blown IntelliJ IDEA Ultimate Edition to be used in former plugin module. - -If you are not dealing with IDEA Ultimate-specific features, you may want to disable corresponding project dependency. -(that will also relieve you from necessity to download the IDEA Ultimate distribution during dependency update process) -To do so change "use.ultimate.by.default" property to false (update_dependencies.xml) before running dependency update Then, you need to run @@ -72,9 +67,6 @@ plugin [see this document](http://devnet.jetbrains.net/docs/DOC-181) which descr From this root project there are Run/Debug Configurations for running IDEA or the Compiler Tests for example; so if you want to try out the latest and greatest IDEA plugin -If you've decided to disable IDEA Ultimate configuration during dependency update, you also need to locally disable the compilation of its dependent code. -To do so you can either delete idea-ultimate module using IDEA action in the Project View, or remove corresponding line in .idea/modules.xml - * VCS -> Git -> Pull * Run IntelliJ IDEA * a child IntelliJ IDEA with the Kotlin plugin will then startup diff --git a/generators/generators.iml b/generators/generators.iml index 2b0b9a476c2..c1adce0e190 100644 --- a/generators/generators.iml +++ b/generators/generators.iml @@ -38,6 +38,5 @@ - \ No newline at end of file diff --git a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt index e37da052342..b7ddad9d633 100644 --- a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt +++ b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt @@ -99,10 +99,6 @@ import org.jetbrains.kotlin.idea.refactoring.pushDown.AbstractPushDownTest import org.jetbrains.kotlin.idea.refactoring.rename.AbstractRenameTest import org.jetbrains.kotlin.idea.refactoring.safeDelete.AbstractSafeDeleteTest import org.jetbrains.kotlin.idea.resolve.* -import org.jetbrains.kotlin.idea.spring.tests.generate.AbstractGenerateSpringDependencyActionTest -import org.jetbrains.kotlin.idea.spring.tests.references.AbstractSpringReferenceCompletionHandlerTest -import org.jetbrains.kotlin.idea.spring.tests.references.AbstractSpringReferenceCompletionTest -import org.jetbrains.kotlin.idea.spring.tests.references.AbstractSpringReferenceNavigationTest import org.jetbrains.kotlin.idea.structureView.AbstractKotlinFileStructureTest import org.jetbrains.kotlin.idea.stubs.AbstractMultiFileHighlightingTest import org.jetbrains.kotlin.idea.stubs.AbstractResolveByStubTest @@ -795,32 +791,6 @@ fun main(args: Array) { } } - testGroup("idea/idea-ultimate/tests", "idea/testData") { - testClass("UltimateInspectionTestGenerated") { - model("ultimateInspections", pattern = "^(inspections\\.test)$", singleClass = true) - } - - testClass("UltimateQuickFixTestGenerated") { - model("ultimateQuickFixes", pattern = "^([\\w\\-_]+)\\.kt$", filenameStartsLowerCase = true) - } - - testClass() { - model("spring/core/references/completion/handler") - } - - testClass() { - model("spring/core/references/completion/variants") - } - - testClass() { - model("spring/core/references/navigation") - } - - testClass() { - model("spring/core/generate", pattern = "^([\\w]+)\\.kt$", singleClass = true) - } - } - testGroup("idea/tests", "compiler/testData") { testClass() { model("loadJava/compiledKotlin") @@ -1132,7 +1102,7 @@ fun main(args: Array) { } } -internal class TestGroup(val testsRoot: String, val testDataRoot: String) { +class TestGroup(val testsRoot: String, val testDataRoot: String) { inline fun testClass( suiteTestClass: String = getDefaultSuiteTestClass(T::class.java), noinline init: TestClass.() -> Unit @@ -1196,11 +1166,11 @@ internal class TestGroup(val testsRoot: String, val testDataRoot: String) { } -private fun testGroup(testsRoot: String, testDataRoot: String, init: TestGroup.() -> Unit) { +fun testGroup(testsRoot: String, testDataRoot: String, init: TestGroup.() -> Unit) { TestGroup(testsRoot, testDataRoot).init() } -private fun getDefaultSuiteTestClass(baseTestClass:Class<*>): String { +fun getDefaultSuiteTestClass(baseTestClass:Class<*>): String { val baseName = baseTestClass.simpleName if (!baseName.startsWith("Abstract")) { throw IllegalArgumentException("Doesn't start with \"Abstract\": $baseName") diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/ideaTestUtils.kt b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/ideaTestUtils.kt index 4d43cbbc46c..2f10667b367 100644 --- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/ideaTestUtils.kt +++ b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/ideaTestUtils.kt @@ -37,4 +37,5 @@ fun CodeInsightTestFixture.configureWithExtraFile(path: String, vararg extraName configureByFiles(*(listOf(path) + extraPaths).toTypedArray()) } +@Suppress("unused") // Used in kotlin-ultimate inline fun Any?.assertInstanceOf() = UsefulTestCase.assertInstanceOf(this, T::class.java) \ No newline at end of file diff --git a/idea/idea-ultimate/idea-ultimate.iml b/idea/idea-ultimate/idea-ultimate.iml deleted file mode 100644 index 9626bf90871..00000000000 --- a/idea/idea-ultimate/idea-ultimate.iml +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml index 5c9c3c2d7c9..eec930825c4 100644 --- a/idea/src/META-INF/plugin.xml +++ b/idea/src/META-INF/plugin.xml @@ -18,12 +18,8 @@ Coverage com.intellij.java-i18n org.intellij.intelliLang - com.intellij.spring - com.intellij.javaee - com.intellij.persistence - com.intellij.database - com.intellij.css - com.intellij.jsp + + diff --git a/ultimate/.gitignore b/ultimate/.gitignore new file mode 100644 index 00000000000..25cdab965cb --- /dev/null +++ b/ultimate/.gitignore @@ -0,0 +1,8 @@ +.DS_Store +.idea/shelf +dependencies +ideaSDK +out +tmp +workspace.xml +*.versionsBackup \ No newline at end of file diff --git a/ultimate/.idea/.name b/ultimate/.idea/.name new file mode 100644 index 00000000000..45a157fd34d --- /dev/null +++ b/ultimate/.idea/.name @@ -0,0 +1 @@ +kotlin-ultimate \ No newline at end of file diff --git a/ultimate/.idea/ant.xml b/ultimate/.idea/ant.xml new file mode 100644 index 00000000000..9b72ed2e713 --- /dev/null +++ b/ultimate/.idea/ant.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/ultimate/.idea/artifacts/Dummy.xml b/ultimate/.idea/artifacts/Dummy.xml new file mode 100644 index 00000000000..b7badbb7f8f --- /dev/null +++ b/ultimate/.idea/artifacts/Dummy.xml @@ -0,0 +1,8 @@ + + + $PROJECT_DIR$/out/artifacts/Dummy + + + + + \ No newline at end of file diff --git a/ultimate/.idea/codeInsightSettings.xml b/ultimate/.idea/codeInsightSettings.xml new file mode 100644 index 00000000000..37f806f2e3e --- /dev/null +++ b/ultimate/.idea/codeInsightSettings.xml @@ -0,0 +1,8 @@ + + + + + kotlin.reflect.jvm.internal.impl + + + \ No newline at end of file diff --git a/ultimate/.idea/compiler.xml b/ultimate/.idea/compiler.xml index 5a3d3f7bee2..a105e8629e8 100644 --- a/ultimate/.idea/compiler.xml +++ b/ultimate/.idea/compiler.xml @@ -1,12 +1,26 @@ + + + \ No newline at end of file diff --git a/ultimate/.idea/copyright/apache.xml b/ultimate/.idea/copyright/apache.xml new file mode 100644 index 00000000000..9b100320269 --- /dev/null +++ b/ultimate/.idea/copyright/apache.xml @@ -0,0 +1,9 @@ + + + + \ No newline at end of file diff --git a/ultimate/.idea/copyright/profiles_settings.xml b/ultimate/.idea/copyright/profiles_settings.xml index 1c2e0fa5db1..5fbc0e59e10 100644 --- a/ultimate/.idea/copyright/profiles_settings.xml +++ b/ultimate/.idea/copyright/profiles_settings.xml @@ -1,5 +1,8 @@ + + + diff --git a/ultimate/.idea/dictionaries/Nikolay_Krasko.xml b/ultimate/.idea/dictionaries/Nikolay_Krasko.xml new file mode 100644 index 00000000000..2995eb1ba67 --- /dev/null +++ b/ultimate/.idea/dictionaries/Nikolay_Krasko.xml @@ -0,0 +1,24 @@ + + + + accessors + fqname + goto + gradle + intrinsics + kdoc + kompiler + memoize + memoized + multiline + preload + preloader + preloading + preprocess + redeclarations + subclassed + subgraph + substep + + + \ No newline at end of file diff --git a/ultimate/.idea/dictionaries/abreslav.xml b/ultimate/.idea/dictionaries/abreslav.xml new file mode 100644 index 00000000000..9035118b0b9 --- /dev/null +++ b/ultimate/.idea/dictionaries/abreslav.xml @@ -0,0 +1,22 @@ + + + + accessor + covariantly + deserialized + dominator + inferrer + iterable + nondeterministic + nullable + overridable + pseudocode + substitutor + subtyping + supertype + supertypes + tuple + unary + + + \ No newline at end of file diff --git a/ultimate/.idea/dictionaries/bashor.xml b/ultimate/.idea/dictionaries/bashor.xml new file mode 100644 index 00000000000..fa362eaa919 --- /dev/null +++ b/ultimate/.idea/dictionaries/bashor.xml @@ -0,0 +1,10 @@ + + + + ctor + interner + lookups + unescape + + + \ No newline at end of file diff --git a/ultimate/.idea/dictionaries/dzharkov.xml b/ultimate/.idea/dictionaries/dzharkov.xml new file mode 100644 index 00000000000..2e8cb56c4fb --- /dev/null +++ b/ultimate/.idea/dictionaries/dzharkov.xml @@ -0,0 +1,8 @@ + + + + checkcast + insn + + + \ No newline at end of file diff --git a/ultimate/.idea/dictionaries/geevee.xml b/ultimate/.idea/dictionaries/geevee.xml new file mode 100644 index 00000000000..c83493eb226 --- /dev/null +++ b/ultimate/.idea/dictionaries/geevee.xml @@ -0,0 +1,13 @@ + + + + builtins + callables + klass + proto + protoc + protos + ubuntu + + + \ No newline at end of file diff --git a/ultimate/.idea/dictionaries/max.xml b/ultimate/.idea/dictionaries/max.xml new file mode 100644 index 00000000000..064d7e3b1c4 --- /dev/null +++ b/ultimate/.idea/dictionaries/max.xml @@ -0,0 +1,9 @@ + + + + classfiles + codegen + kotlin + + + \ No newline at end of file diff --git a/ultimate/.idea/dictionaries/valentin.xml b/ultimate/.idea/dictionaries/valentin.xml new file mode 100644 index 00000000000..b033708428b --- /dev/null +++ b/ultimate/.idea/dictionaries/valentin.xml @@ -0,0 +1,25 @@ + + + + decapitalize + delegator + funs + immediates + initializers + inserter + negatable + pparent + precheck + prioritizer + processings + rbrace + rbracket + renderers + rparenth + selectioner + summand + unpluralize + weighers + + + \ No newline at end of file diff --git a/ultimate/.idea/encodings.xml b/ultimate/.idea/encodings.xml index 97626ba4544..f758959656c 100644 --- a/ultimate/.idea/encodings.xml +++ b/ultimate/.idea/encodings.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/ultimate/.idea/inspectionProfiles/idea_default.xml b/ultimate/.idea/inspectionProfiles/idea_default.xml new file mode 100644 index 00000000000..ca6e2ba2d81 --- /dev/null +++ b/ultimate/.idea/inspectionProfiles/idea_default.xml @@ -0,0 +1,426 @@ + + + + \ No newline at end of file diff --git a/ultimate/.idea/inspectionProfiles/profiles_settings.xml b/ultimate/.idea/inspectionProfiles/profiles_settings.xml index 3b312839bf2..78f1346b901 100644 --- a/ultimate/.idea/inspectionProfiles/profiles_settings.xml +++ b/ultimate/.idea/inspectionProfiles/profiles_settings.xml @@ -1,6 +1,6 @@ - diff --git a/ultimate/.idea/kotlinc.xml b/ultimate/.idea/kotlinc.xml new file mode 100644 index 00000000000..ea56145a5ba --- /dev/null +++ b/ultimate/.idea/kotlinc.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/libraries/css_support.xml b/ultimate/.idea/libraries/css_support.xml similarity index 100% rename from .idea/libraries/css_support.xml rename to ultimate/.idea/libraries/css_support.xml diff --git a/.idea/libraries/database_support.xml b/ultimate/.idea/libraries/database_support.xml similarity index 100% rename from .idea/libraries/database_support.xml rename to ultimate/.idea/libraries/database_support.xml diff --git a/ultimate/.idea/libraries/gradle_and_groovy_plugin.xml b/ultimate/.idea/libraries/gradle_and_groovy_plugin.xml new file mode 100644 index 00000000000..d5c6cf7816a --- /dev/null +++ b/ultimate/.idea/libraries/gradle_and_groovy_plugin.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ultimate/.idea/libraries/idea_full.xml b/ultimate/.idea/libraries/idea_full.xml new file mode 100644 index 00000000000..38b552dca00 --- /dev/null +++ b/ultimate/.idea/libraries/idea_full.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ultimate/.idea/libraries/intellij_core.xml b/ultimate/.idea/libraries/intellij_core.xml new file mode 100644 index 00000000000..0a5def14562 --- /dev/null +++ b/ultimate/.idea/libraries/intellij_core.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ultimate/.idea/libraries/java_i18n.xml b/ultimate/.idea/libraries/java_i18n.xml new file mode 100644 index 00000000000..4917d9c5249 --- /dev/null +++ b/ultimate/.idea/libraries/java_i18n.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/javaee_support.xml b/ultimate/.idea/libraries/javaee_support.xml similarity index 100% rename from .idea/libraries/javaee_support.xml rename to ultimate/.idea/libraries/javaee_support.xml diff --git a/ultimate/.idea/libraries/javax_inject.xml b/ultimate/.idea/libraries/javax_inject.xml new file mode 100644 index 00000000000..dd28241051c --- /dev/null +++ b/ultimate/.idea/libraries/javax_inject.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/jsp_support.xml b/ultimate/.idea/libraries/jsp_support.xml similarity index 100% rename from .idea/libraries/jsp_support.xml rename to ultimate/.idea/libraries/jsp_support.xml diff --git a/ultimate/.idea/libraries/junit_plugin.xml b/ultimate/.idea/libraries/junit_plugin.xml new file mode 100644 index 00000000000..8a6fddf51da --- /dev/null +++ b/ultimate/.idea/libraries/junit_plugin.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ultimate/.idea/libraries/kotlin_reflect.xml b/ultimate/.idea/libraries/kotlin_reflect.xml new file mode 100644 index 00000000000..4e375061276 --- /dev/null +++ b/ultimate/.idea/libraries/kotlin_reflect.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/ultimate/.idea/libraries/kotlin_runtime.xml b/ultimate/.idea/libraries/kotlin_runtime.xml new file mode 100644 index 00000000000..266d4c90c1e --- /dev/null +++ b/ultimate/.idea/libraries/kotlin_runtime.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/ultimate/.idea/libraries/main_project_production.xml b/ultimate/.idea/libraries/main_project_production.xml new file mode 100644 index 00000000000..4effdebc0dc --- /dev/null +++ b/ultimate/.idea/libraries/main_project_production.xml @@ -0,0 +1,99 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ultimate/.idea/libraries/main_project_tests.xml b/ultimate/.idea/libraries/main_project_tests.xml new file mode 100644 index 00000000000..e3938da51a4 --- /dev/null +++ b/ultimate/.idea/libraries/main_project_tests.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/persistence_support.xml b/ultimate/.idea/libraries/persistence_support.xml similarity index 100% rename from .idea/libraries/persistence_support.xml rename to ultimate/.idea/libraries/persistence_support.xml diff --git a/ultimate/.idea/libraries/properties.xml b/ultimate/.idea/libraries/properties.xml new file mode 100644 index 00000000000..602d6d3d1e7 --- /dev/null +++ b/ultimate/.idea/libraries/properties.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/spring_support.xml b/ultimate/.idea/libraries/spring_support.xml similarity index 100% rename from .idea/libraries/spring_support.xml rename to ultimate/.idea/libraries/spring_support.xml diff --git a/ultimate/.idea/misc.xml b/ultimate/.idea/misc.xml index 74b9a26b5a2..9181bc9c69c 100644 --- a/ultimate/.idea/misc.xml +++ b/ultimate/.idea/misc.xml @@ -7,11 +7,58 @@ + + + + + + + + + + + + + + + + + + http://www.w3.org/1999/xhtml - + + + + + + \ No newline at end of file diff --git a/ultimate/.idea/modules.xml b/ultimate/.idea/modules.xml new file mode 100644 index 00000000000..4cf4939de41 --- /dev/null +++ b/ultimate/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/ultimate/.idea/projectCodeStyle.xml b/ultimate/.idea/projectCodeStyle.xml new file mode 100644 index 00000000000..25b91e81484 --- /dev/null +++ b/ultimate/.idea/projectCodeStyle.xml @@ -0,0 +1,171 @@ + + + + + + + diff --git a/ultimate/.idea/runConfigurations/Generate_Tests.xml b/ultimate/.idea/runConfigurations/Generate_Tests.xml new file mode 100644 index 00000000000..08653927ea2 --- /dev/null +++ b/ultimate/.idea/runConfigurations/Generate_Tests.xml @@ -0,0 +1,31 @@ + + + + + + + + \ No newline at end of file diff --git a/ultimate/.idea/runConfigurations/IDEA.xml b/ultimate/.idea/runConfigurations/IDEA.xml new file mode 100644 index 00000000000..1e6acf699f7 --- /dev/null +++ b/ultimate/.idea/runConfigurations/IDEA.xml @@ -0,0 +1,47 @@ + + + + + \ No newline at end of file diff --git a/ultimate/.idea/runConfigurations/IDEA__No_ProcessCanceledException_.xml b/ultimate/.idea/runConfigurations/IDEA__No_ProcessCanceledException_.xml new file mode 100644 index 00000000000..73c810e7279 --- /dev/null +++ b/ultimate/.idea/runConfigurations/IDEA__No_ProcessCanceledException_.xml @@ -0,0 +1,28 @@ + + + + + \ No newline at end of file diff --git a/ultimate/.idea/runConfigurations/Ultimate_Plugin_Tests.xml b/ultimate/.idea/runConfigurations/Ultimate_Plugin_Tests.xml new file mode 100644 index 00000000000..fc8896e9140 --- /dev/null +++ b/ultimate/.idea/runConfigurations/Ultimate_Plugin_Tests.xml @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ultimate/.idea/uiDesigner.xml b/ultimate/.idea/uiDesigner.xml index e96534fb27b..b9cf899ced5 100644 --- a/ultimate/.idea/uiDesigner.xml +++ b/ultimate/.idea/uiDesigner.xml @@ -120,5 +120,17 @@ + + + + + + + + + + + - \ No newline at end of file + + diff --git a/ultimate/.idea/vcs.xml b/ultimate/.idea/vcs.xml new file mode 100644 index 00000000000..cb0c670e825 --- /dev/null +++ b/ultimate/.idea/vcs.xml @@ -0,0 +1,21 @@ + + + + + + + + + + diff --git a/ultimate/build.xml b/ultimate/build.xml new file mode 100644 index 00000000000..cc36d38d6bb --- /dev/null +++ b/ultimate/build.xml @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ultimate/kotlin-ultimate.iml b/ultimate/kotlin-ultimate.iml new file mode 100644 index 00000000000..398bda02821 --- /dev/null +++ b/ultimate/kotlin-ultimate.iml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idea/idea-ultimate/resources/inspectionDescriptions/KotlinFinalClassOrFunSpring.html b/ultimate/resources/inspectionDescriptions/KotlinFinalClassOrFunSpring.html similarity index 100% rename from idea/idea-ultimate/resources/inspectionDescriptions/KotlinFinalClassOrFunSpring.html rename to ultimate/resources/inspectionDescriptions/KotlinFinalClassOrFunSpring.html diff --git a/idea/idea-ultimate/resources/inspectionDescriptions/KotlinSpringFacetCode.html b/ultimate/resources/inspectionDescriptions/KotlinSpringFacetCode.html similarity index 100% rename from idea/idea-ultimate/resources/inspectionDescriptions/KotlinSpringFacetCode.html rename to ultimate/resources/inspectionDescriptions/KotlinSpringFacetCode.html diff --git a/idea/idea-ultimate/src/META-INF/kotlin-spring.xml b/ultimate/src/META-INF/kotlin-spring.xml similarity index 100% rename from idea/idea-ultimate/src/META-INF/kotlin-spring.xml rename to ultimate/src/META-INF/kotlin-spring.xml diff --git a/ultimate/src/META-INF/ultimate-plugin.xml b/ultimate/src/META-INF/ultimate-plugin.xml new file mode 100644 index 00000000000..f40b3b56cf6 --- /dev/null +++ b/ultimate/src/META-INF/ultimate-plugin.xml @@ -0,0 +1,8 @@ + + com.intellij.spring + com.intellij.javaee + com.intellij.persistence + com.intellij.database + com.intellij.css + com.intellij.jsp + \ No newline at end of file diff --git a/idea/idea-ultimate/src/org/jetbrains/kotlin/idea/spring/el/KotlinSpringELInjector.kt b/ultimate/src/org/jetbrains/kotlin/idea/spring/el/KotlinSpringELInjector.kt similarity index 100% rename from idea/idea-ultimate/src/org/jetbrains/kotlin/idea/spring/el/KotlinSpringELInjector.kt rename to ultimate/src/org/jetbrains/kotlin/idea/spring/el/KotlinSpringELInjector.kt diff --git a/idea/idea-ultimate/src/org/jetbrains/kotlin/idea/spring/generate/GenerateKotlinAutowiredDependencyAction.kt b/ultimate/src/org/jetbrains/kotlin/idea/spring/generate/GenerateKotlinAutowiredDependencyAction.kt similarity index 100% rename from idea/idea-ultimate/src/org/jetbrains/kotlin/idea/spring/generate/GenerateKotlinAutowiredDependencyAction.kt rename to ultimate/src/org/jetbrains/kotlin/idea/spring/generate/GenerateKotlinAutowiredDependencyAction.kt diff --git a/idea/idea-ultimate/src/org/jetbrains/kotlin/idea/spring/generate/GenerateKotlinSpringBeanDependencyAction.kt b/ultimate/src/org/jetbrains/kotlin/idea/spring/generate/GenerateKotlinSpringBeanDependencyAction.kt similarity index 100% rename from idea/idea-ultimate/src/org/jetbrains/kotlin/idea/spring/generate/GenerateKotlinSpringBeanDependencyAction.kt rename to ultimate/src/org/jetbrains/kotlin/idea/spring/generate/GenerateKotlinSpringBeanDependencyAction.kt diff --git a/idea/idea-ultimate/src/org/jetbrains/kotlin/idea/spring/generate/GenerateKotlinSpringBeanXmlDependencyAction.kt b/ultimate/src/org/jetbrains/kotlin/idea/spring/generate/GenerateKotlinSpringBeanXmlDependencyAction.kt similarity index 100% rename from idea/idea-ultimate/src/org/jetbrains/kotlin/idea/spring/generate/GenerateKotlinSpringBeanXmlDependencyAction.kt rename to ultimate/src/org/jetbrains/kotlin/idea/spring/generate/GenerateKotlinSpringBeanXmlDependencyAction.kt diff --git a/idea/idea-ultimate/src/org/jetbrains/kotlin/idea/spring/generate/generateAutowiredDependenciesUtils.kt b/ultimate/src/org/jetbrains/kotlin/idea/spring/generate/generateAutowiredDependenciesUtils.kt similarity index 100% rename from idea/idea-ultimate/src/org/jetbrains/kotlin/idea/spring/generate/generateAutowiredDependenciesUtils.kt rename to ultimate/src/org/jetbrains/kotlin/idea/spring/generate/generateAutowiredDependenciesUtils.kt diff --git a/idea/idea-ultimate/src/org/jetbrains/kotlin/idea/spring/generate/generateDependenciesUtils.kt b/ultimate/src/org/jetbrains/kotlin/idea/spring/generate/generateDependenciesUtils.kt similarity index 100% rename from idea/idea-ultimate/src/org/jetbrains/kotlin/idea/spring/generate/generateDependenciesUtils.kt rename to ultimate/src/org/jetbrains/kotlin/idea/spring/generate/generateDependenciesUtils.kt diff --git a/idea/idea-ultimate/src/org/jetbrains/kotlin/idea/spring/inspections/KotlinFinalClassOrFunSpringInspection.kt b/ultimate/src/org/jetbrains/kotlin/idea/spring/inspections/KotlinFinalClassOrFunSpringInspection.kt similarity index 100% rename from idea/idea-ultimate/src/org/jetbrains/kotlin/idea/spring/inspections/KotlinFinalClassOrFunSpringInspection.kt rename to ultimate/src/org/jetbrains/kotlin/idea/spring/inspections/KotlinFinalClassOrFunSpringInspection.kt diff --git a/idea/idea-ultimate/src/org/jetbrains/kotlin/idea/spring/inspections/KotlinSpringFacetCodeInspection.kt b/ultimate/src/org/jetbrains/kotlin/idea/spring/inspections/KotlinSpringFacetCodeInspection.kt similarity index 100% rename from idea/idea-ultimate/src/org/jetbrains/kotlin/idea/spring/inspections/KotlinSpringFacetCodeInspection.kt rename to ultimate/src/org/jetbrains/kotlin/idea/spring/inspections/KotlinSpringFacetCodeInspection.kt diff --git a/idea/idea-ultimate/src/org/jetbrains/kotlin/idea/spring/lineMarking/KotlinSpringClassAnnotator.kt b/ultimate/src/org/jetbrains/kotlin/idea/spring/lineMarking/KotlinSpringClassAnnotator.kt similarity index 100% rename from idea/idea-ultimate/src/org/jetbrains/kotlin/idea/spring/lineMarking/KotlinSpringClassAnnotator.kt rename to ultimate/src/org/jetbrains/kotlin/idea/spring/lineMarking/KotlinSpringClassAnnotator.kt diff --git a/idea/idea-ultimate/src/org/jetbrains/kotlin/idea/spring/references/KotlinSpringReferenceContributor.kt b/ultimate/src/org/jetbrains/kotlin/idea/spring/references/KotlinSpringReferenceContributor.kt similarity index 100% rename from idea/idea-ultimate/src/org/jetbrains/kotlin/idea/spring/references/KotlinSpringReferenceContributor.kt rename to ultimate/src/org/jetbrains/kotlin/idea/spring/references/KotlinSpringReferenceContributor.kt diff --git a/idea/idea-ultimate/src/org/jetbrains/kotlin/idea/spring/references/KtSpringBeanScopeReference.kt b/ultimate/src/org/jetbrains/kotlin/idea/spring/references/KtSpringBeanScopeReference.kt similarity index 100% rename from idea/idea-ultimate/src/org/jetbrains/kotlin/idea/spring/references/KtSpringBeanScopeReference.kt rename to ultimate/src/org/jetbrains/kotlin/idea/spring/references/KtSpringBeanScopeReference.kt diff --git a/idea/idea-ultimate/src/org/jetbrains/kotlin/idea/spring/springUtils.kt b/ultimate/src/org/jetbrains/kotlin/idea/spring/springUtils.kt similarity index 100% rename from idea/idea-ultimate/src/org/jetbrains/kotlin/idea/spring/springUtils.kt rename to ultimate/src/org/jetbrains/kotlin/idea/spring/springUtils.kt diff --git a/idea/testData/ultimateInspections/spring/finalSpringAnnotatedDeclaration/inspectionData/expected.xml b/ultimate/testData/inspections/spring/finalSpringAnnotatedDeclaration/inspectionData/expected.xml similarity index 100% rename from idea/testData/ultimateInspections/spring/finalSpringAnnotatedDeclaration/inspectionData/expected.xml rename to ultimate/testData/inspections/spring/finalSpringAnnotatedDeclaration/inspectionData/expected.xml diff --git a/idea/testData/ultimateInspections/spring/finalSpringAnnotatedDeclaration/inspectionData/inspections.test b/ultimate/testData/inspections/spring/finalSpringAnnotatedDeclaration/inspectionData/inspections.test similarity index 100% rename from idea/testData/ultimateInspections/spring/finalSpringAnnotatedDeclaration/inspectionData/inspections.test rename to ultimate/testData/inspections/spring/finalSpringAnnotatedDeclaration/inspectionData/inspections.test diff --git a/idea/testData/ultimateInspections/spring/finalSpringAnnotatedDeclaration/test.kt b/ultimate/testData/inspections/spring/finalSpringAnnotatedDeclaration/test.kt similarity index 100% rename from idea/testData/ultimateInspections/spring/finalSpringAnnotatedDeclaration/test.kt rename to ultimate/testData/inspections/spring/finalSpringAnnotatedDeclaration/test.kt diff --git a/idea/testData/ultimateInspections/spring/unconfiguredFacet/inspectionData/expected.xml b/ultimate/testData/inspections/spring/unconfiguredFacet/inspectionData/expected.xml similarity index 100% rename from idea/testData/ultimateInspections/spring/unconfiguredFacet/inspectionData/expected.xml rename to ultimate/testData/inspections/spring/unconfiguredFacet/inspectionData/expected.xml diff --git a/idea/testData/ultimateInspections/spring/unconfiguredFacet/inspectionData/inspections.test b/ultimate/testData/inspections/spring/unconfiguredFacet/inspectionData/inspections.test similarity index 100% rename from idea/testData/ultimateInspections/spring/unconfiguredFacet/inspectionData/inspections.test rename to ultimate/testData/inspections/spring/unconfiguredFacet/inspectionData/inspections.test diff --git a/idea/testData/ultimateInspections/spring/unconfiguredFacet/test.kt b/ultimate/testData/inspections/spring/unconfiguredFacet/test.kt similarity index 100% rename from idea/testData/ultimateInspections/spring/unconfiguredFacet/test.kt rename to ultimate/testData/inspections/spring/unconfiguredFacet/test.kt diff --git a/idea/testData/ultimateQuickFixes/spring/finalSpringAnnotatedDeclaration/.inspection b/ultimate/testData/quickFixes/spring/finalSpringAnnotatedDeclaration/.inspection similarity index 100% rename from idea/testData/ultimateQuickFixes/spring/finalSpringAnnotatedDeclaration/.inspection rename to ultimate/testData/quickFixes/spring/finalSpringAnnotatedDeclaration/.inspection diff --git a/idea/testData/ultimateQuickFixes/spring/finalSpringAnnotatedDeclaration/classWithComponentRuntime.kt b/ultimate/testData/quickFixes/spring/finalSpringAnnotatedDeclaration/classWithComponentRuntime.kt similarity index 100% rename from idea/testData/ultimateQuickFixes/spring/finalSpringAnnotatedDeclaration/classWithComponentRuntime.kt rename to ultimate/testData/quickFixes/spring/finalSpringAnnotatedDeclaration/classWithComponentRuntime.kt diff --git a/idea/testData/ultimateQuickFixes/spring/finalSpringAnnotatedDeclaration/classWithComponentRuntime.kt.after b/ultimate/testData/quickFixes/spring/finalSpringAnnotatedDeclaration/classWithComponentRuntime.kt.after similarity index 100% rename from idea/testData/ultimateQuickFixes/spring/finalSpringAnnotatedDeclaration/classWithComponentRuntime.kt.after rename to ultimate/testData/quickFixes/spring/finalSpringAnnotatedDeclaration/classWithComponentRuntime.kt.after diff --git a/idea/testData/ultimateQuickFixes/spring/finalSpringAnnotatedDeclaration/classWithConfigurationRuntime.kt b/ultimate/testData/quickFixes/spring/finalSpringAnnotatedDeclaration/classWithConfigurationRuntime.kt similarity index 100% rename from idea/testData/ultimateQuickFixes/spring/finalSpringAnnotatedDeclaration/classWithConfigurationRuntime.kt rename to ultimate/testData/quickFixes/spring/finalSpringAnnotatedDeclaration/classWithConfigurationRuntime.kt diff --git a/idea/testData/ultimateQuickFixes/spring/finalSpringAnnotatedDeclaration/classWithConfigurationRuntime.kt.after b/ultimate/testData/quickFixes/spring/finalSpringAnnotatedDeclaration/classWithConfigurationRuntime.kt.after similarity index 100% rename from idea/testData/ultimateQuickFixes/spring/finalSpringAnnotatedDeclaration/classWithConfigurationRuntime.kt.after rename to ultimate/testData/quickFixes/spring/finalSpringAnnotatedDeclaration/classWithConfigurationRuntime.kt.after diff --git a/idea/testData/ultimateQuickFixes/spring/finalSpringAnnotatedDeclaration/classWithCustomConfigurationRuntime.kt b/ultimate/testData/quickFixes/spring/finalSpringAnnotatedDeclaration/classWithCustomConfigurationRuntime.kt similarity index 100% rename from idea/testData/ultimateQuickFixes/spring/finalSpringAnnotatedDeclaration/classWithCustomConfigurationRuntime.kt rename to ultimate/testData/quickFixes/spring/finalSpringAnnotatedDeclaration/classWithCustomConfigurationRuntime.kt diff --git a/idea/testData/ultimateQuickFixes/spring/finalSpringAnnotatedDeclaration/classWithCustomConfigurationRuntime.kt.after b/ultimate/testData/quickFixes/spring/finalSpringAnnotatedDeclaration/classWithCustomConfigurationRuntime.kt.after similarity index 100% rename from idea/testData/ultimateQuickFixes/spring/finalSpringAnnotatedDeclaration/classWithCustomConfigurationRuntime.kt.after rename to ultimate/testData/quickFixes/spring/finalSpringAnnotatedDeclaration/classWithCustomConfigurationRuntime.kt.after diff --git a/idea/testData/ultimateQuickFixes/spring/finalSpringAnnotatedDeclaration/funWithBeanFinalClassRuntime.kt b/ultimate/testData/quickFixes/spring/finalSpringAnnotatedDeclaration/funWithBeanFinalClassRuntime.kt similarity index 100% rename from idea/testData/ultimateQuickFixes/spring/finalSpringAnnotatedDeclaration/funWithBeanFinalClassRuntime.kt rename to ultimate/testData/quickFixes/spring/finalSpringAnnotatedDeclaration/funWithBeanFinalClassRuntime.kt diff --git a/idea/testData/ultimateQuickFixes/spring/finalSpringAnnotatedDeclaration/funWithBeanFinalClassRuntime.kt.after b/ultimate/testData/quickFixes/spring/finalSpringAnnotatedDeclaration/funWithBeanFinalClassRuntime.kt.after similarity index 100% rename from idea/testData/ultimateQuickFixes/spring/finalSpringAnnotatedDeclaration/funWithBeanFinalClassRuntime.kt.after rename to ultimate/testData/quickFixes/spring/finalSpringAnnotatedDeclaration/funWithBeanFinalClassRuntime.kt.after diff --git a/idea/testData/ultimateQuickFixes/spring/finalSpringAnnotatedDeclaration/funWithBeanOpenClassRuntime.kt b/ultimate/testData/quickFixes/spring/finalSpringAnnotatedDeclaration/funWithBeanOpenClassRuntime.kt similarity index 100% rename from idea/testData/ultimateQuickFixes/spring/finalSpringAnnotatedDeclaration/funWithBeanOpenClassRuntime.kt rename to ultimate/testData/quickFixes/spring/finalSpringAnnotatedDeclaration/funWithBeanOpenClassRuntime.kt diff --git a/idea/testData/ultimateQuickFixes/spring/finalSpringAnnotatedDeclaration/funWithBeanOpenClassRuntime.kt.after b/ultimate/testData/quickFixes/spring/finalSpringAnnotatedDeclaration/funWithBeanOpenClassRuntime.kt.after similarity index 100% rename from idea/testData/ultimateQuickFixes/spring/finalSpringAnnotatedDeclaration/funWithBeanOpenClassRuntime.kt.after rename to ultimate/testData/quickFixes/spring/finalSpringAnnotatedDeclaration/funWithBeanOpenClassRuntime.kt.after diff --git a/idea/testData/ultimateQuickFixes/spring/finalSpringAnnotatedDeclaration/funWithCustomBeanFinalClassRuntime.kt b/ultimate/testData/quickFixes/spring/finalSpringAnnotatedDeclaration/funWithCustomBeanFinalClassRuntime.kt similarity index 100% rename from idea/testData/ultimateQuickFixes/spring/finalSpringAnnotatedDeclaration/funWithCustomBeanFinalClassRuntime.kt rename to ultimate/testData/quickFixes/spring/finalSpringAnnotatedDeclaration/funWithCustomBeanFinalClassRuntime.kt diff --git a/idea/testData/ultimateQuickFixes/spring/finalSpringAnnotatedDeclaration/funWithCustomBeanFinalClassRuntime.kt.after b/ultimate/testData/quickFixes/spring/finalSpringAnnotatedDeclaration/funWithCustomBeanFinalClassRuntime.kt.after similarity index 100% rename from idea/testData/ultimateQuickFixes/spring/finalSpringAnnotatedDeclaration/funWithCustomBeanFinalClassRuntime.kt.after rename to ultimate/testData/quickFixes/spring/finalSpringAnnotatedDeclaration/funWithCustomBeanFinalClassRuntime.kt.after diff --git a/idea/testData/ultimateQuickFixes/spring/finalSpringAnnotatedDeclaration/funWithCustomBeanOpenClassRuntime.kt b/ultimate/testData/quickFixes/spring/finalSpringAnnotatedDeclaration/funWithCustomBeanOpenClassRuntime.kt similarity index 100% rename from idea/testData/ultimateQuickFixes/spring/finalSpringAnnotatedDeclaration/funWithCustomBeanOpenClassRuntime.kt rename to ultimate/testData/quickFixes/spring/finalSpringAnnotatedDeclaration/funWithCustomBeanOpenClassRuntime.kt diff --git a/idea/testData/ultimateQuickFixes/spring/finalSpringAnnotatedDeclaration/funWithCustomBeanOpenClassRuntime.kt.after b/ultimate/testData/quickFixes/spring/finalSpringAnnotatedDeclaration/funWithCustomBeanOpenClassRuntime.kt.after similarity index 100% rename from idea/testData/ultimateQuickFixes/spring/finalSpringAnnotatedDeclaration/funWithCustomBeanOpenClassRuntime.kt.after rename to ultimate/testData/quickFixes/spring/finalSpringAnnotatedDeclaration/funWithCustomBeanOpenClassRuntime.kt.after diff --git a/idea/testData/spring/core/generate/autowiredDependencies/duplicatingPropertyAnnotationConfig.kt b/ultimate/testData/spring/core/generate/autowiredDependencies/duplicatingPropertyAnnotationConfig.kt similarity index 100% rename from idea/testData/spring/core/generate/autowiredDependencies/duplicatingPropertyAnnotationConfig.kt rename to ultimate/testData/spring/core/generate/autowiredDependencies/duplicatingPropertyAnnotationConfig.kt diff --git a/idea/testData/spring/core/generate/autowiredDependencies/duplicatingPropertyAnnotationConfig.kt.after b/ultimate/testData/spring/core/generate/autowiredDependencies/duplicatingPropertyAnnotationConfig.kt.after similarity index 100% rename from idea/testData/spring/core/generate/autowiredDependencies/duplicatingPropertyAnnotationConfig.kt.after rename to ultimate/testData/spring/core/generate/autowiredDependencies/duplicatingPropertyAnnotationConfig.kt.after diff --git a/idea/testData/spring/core/generate/autowiredDependencies/duplicatingPropertyXmlConfig.kt b/ultimate/testData/spring/core/generate/autowiredDependencies/duplicatingPropertyXmlConfig.kt similarity index 100% rename from idea/testData/spring/core/generate/autowiredDependencies/duplicatingPropertyXmlConfig.kt rename to ultimate/testData/spring/core/generate/autowiredDependencies/duplicatingPropertyXmlConfig.kt diff --git a/idea/testData/spring/core/generate/autowiredDependencies/duplicatingPropertyXmlConfig.kt.after b/ultimate/testData/spring/core/generate/autowiredDependencies/duplicatingPropertyXmlConfig.kt.after similarity index 100% rename from idea/testData/spring/core/generate/autowiredDependencies/duplicatingPropertyXmlConfig.kt.after rename to ultimate/testData/spring/core/generate/autowiredDependencies/duplicatingPropertyXmlConfig.kt.after diff --git a/idea/testData/spring/core/generate/autowiredDependencies/multiplePropertiesAnnotationConfig.kt b/ultimate/testData/spring/core/generate/autowiredDependencies/multiplePropertiesAnnotationConfig.kt similarity index 100% rename from idea/testData/spring/core/generate/autowiredDependencies/multiplePropertiesAnnotationConfig.kt rename to ultimate/testData/spring/core/generate/autowiredDependencies/multiplePropertiesAnnotationConfig.kt diff --git a/idea/testData/spring/core/generate/autowiredDependencies/multiplePropertiesAnnotationConfig.kt.after b/ultimate/testData/spring/core/generate/autowiredDependencies/multiplePropertiesAnnotationConfig.kt.after similarity index 100% rename from idea/testData/spring/core/generate/autowiredDependencies/multiplePropertiesAnnotationConfig.kt.after rename to ultimate/testData/spring/core/generate/autowiredDependencies/multiplePropertiesAnnotationConfig.kt.after diff --git a/idea/testData/spring/core/generate/autowiredDependencies/multiplePropertiesXmlConfig.kt b/ultimate/testData/spring/core/generate/autowiredDependencies/multiplePropertiesXmlConfig.kt similarity index 100% rename from idea/testData/spring/core/generate/autowiredDependencies/multiplePropertiesXmlConfig.kt rename to ultimate/testData/spring/core/generate/autowiredDependencies/multiplePropertiesXmlConfig.kt diff --git a/idea/testData/spring/core/generate/autowiredDependencies/multiplePropertiesXmlConfig.kt.after b/ultimate/testData/spring/core/generate/autowiredDependencies/multiplePropertiesXmlConfig.kt.after similarity index 100% rename from idea/testData/spring/core/generate/autowiredDependencies/multiplePropertiesXmlConfig.kt.after rename to ultimate/testData/spring/core/generate/autowiredDependencies/multiplePropertiesXmlConfig.kt.after diff --git a/idea/testData/spring/core/generate/autowiredDependencies/propertyWithQualifierAnnotationConfig.kt b/ultimate/testData/spring/core/generate/autowiredDependencies/propertyWithQualifierAnnotationConfig.kt similarity index 100% rename from idea/testData/spring/core/generate/autowiredDependencies/propertyWithQualifierAnnotationConfig.kt rename to ultimate/testData/spring/core/generate/autowiredDependencies/propertyWithQualifierAnnotationConfig.kt diff --git a/idea/testData/spring/core/generate/autowiredDependencies/propertyWithQualifierAnnotationConfig.kt.after b/ultimate/testData/spring/core/generate/autowiredDependencies/propertyWithQualifierAnnotationConfig.kt.after similarity index 100% rename from idea/testData/spring/core/generate/autowiredDependencies/propertyWithQualifierAnnotationConfig.kt.after rename to ultimate/testData/spring/core/generate/autowiredDependencies/propertyWithQualifierAnnotationConfig.kt.after diff --git a/idea/testData/spring/core/generate/autowiredDependencies/propertyWithQualifierXmlConfig.kt b/ultimate/testData/spring/core/generate/autowiredDependencies/propertyWithQualifierXmlConfig.kt similarity index 100% rename from idea/testData/spring/core/generate/autowiredDependencies/propertyWithQualifierXmlConfig.kt rename to ultimate/testData/spring/core/generate/autowiredDependencies/propertyWithQualifierXmlConfig.kt diff --git a/idea/testData/spring/core/generate/autowiredDependencies/propertyWithQualifierXmlConfig.kt.after b/ultimate/testData/spring/core/generate/autowiredDependencies/propertyWithQualifierXmlConfig.kt.after similarity index 100% rename from idea/testData/spring/core/generate/autowiredDependencies/propertyWithQualifierXmlConfig.kt.after rename to ultimate/testData/spring/core/generate/autowiredDependencies/propertyWithQualifierXmlConfig.kt.after diff --git a/idea/testData/spring/core/generate/autowiredDependencies/singlePropertyAnnotationConfig.kt b/ultimate/testData/spring/core/generate/autowiredDependencies/singlePropertyAnnotationConfig.kt similarity index 100% rename from idea/testData/spring/core/generate/autowiredDependencies/singlePropertyAnnotationConfig.kt rename to ultimate/testData/spring/core/generate/autowiredDependencies/singlePropertyAnnotationConfig.kt diff --git a/idea/testData/spring/core/generate/autowiredDependencies/singlePropertyAnnotationConfig.kt.after b/ultimate/testData/spring/core/generate/autowiredDependencies/singlePropertyAnnotationConfig.kt.after similarity index 100% rename from idea/testData/spring/core/generate/autowiredDependencies/singlePropertyAnnotationConfig.kt.after rename to ultimate/testData/spring/core/generate/autowiredDependencies/singlePropertyAnnotationConfig.kt.after diff --git a/idea/testData/spring/core/generate/autowiredDependencies/singlePropertyXmlConfig.kt b/ultimate/testData/spring/core/generate/autowiredDependencies/singlePropertyXmlConfig.kt similarity index 100% rename from idea/testData/spring/core/generate/autowiredDependencies/singlePropertyXmlConfig.kt rename to ultimate/testData/spring/core/generate/autowiredDependencies/singlePropertyXmlConfig.kt diff --git a/idea/testData/spring/core/generate/autowiredDependencies/singlePropertyXmlConfig.kt.after b/ultimate/testData/spring/core/generate/autowiredDependencies/singlePropertyXmlConfig.kt.after similarity index 100% rename from idea/testData/spring/core/generate/autowiredDependencies/singlePropertyXmlConfig.kt.after rename to ultimate/testData/spring/core/generate/autowiredDependencies/singlePropertyXmlConfig.kt.after diff --git a/idea/testData/spring/core/generate/autowiredDependencies/spring-config.xml b/ultimate/testData/spring/core/generate/autowiredDependencies/spring-config.xml similarity index 100% rename from idea/testData/spring/core/generate/autowiredDependencies/spring-config.xml rename to ultimate/testData/spring/core/generate/autowiredDependencies/spring-config.xml diff --git a/idea/testData/spring/core/generate/beanDependenciesByXml/factoryBean-config.xml b/ultimate/testData/spring/core/generate/beanDependenciesByXml/factoryBean-config.xml similarity index 100% rename from idea/testData/spring/core/generate/beanDependenciesByXml/factoryBean-config.xml rename to ultimate/testData/spring/core/generate/beanDependenciesByXml/factoryBean-config.xml diff --git a/idea/testData/spring/core/generate/beanDependenciesByXml/factoryBean-config.xml.after b/ultimate/testData/spring/core/generate/beanDependenciesByXml/factoryBean-config.xml.after similarity index 100% rename from idea/testData/spring/core/generate/beanDependenciesByXml/factoryBean-config.xml.after rename to ultimate/testData/spring/core/generate/beanDependenciesByXml/factoryBean-config.xml.after diff --git a/idea/testData/spring/core/generate/beanDependenciesByXml/factoryBean.kt.after b/ultimate/testData/spring/core/generate/beanDependenciesByXml/factoryBean.kt.after similarity index 100% rename from idea/testData/spring/core/generate/beanDependenciesByXml/factoryBean.kt.after rename to ultimate/testData/spring/core/generate/beanDependenciesByXml/factoryBean.kt.after diff --git a/idea/testData/spring/core/generate/beanDependenciesByXml/factoryBean.kt_disabled b/ultimate/testData/spring/core/generate/beanDependenciesByXml/factoryBean.kt_disabled similarity index 100% rename from idea/testData/spring/core/generate/beanDependenciesByXml/factoryBean.kt_disabled rename to ultimate/testData/spring/core/generate/beanDependenciesByXml/factoryBean.kt_disabled diff --git a/idea/testData/spring/core/generate/beanDependenciesByXml/factoryMethod-config.xml b/ultimate/testData/spring/core/generate/beanDependenciesByXml/factoryMethod-config.xml similarity index 100% rename from idea/testData/spring/core/generate/beanDependenciesByXml/factoryMethod-config.xml rename to ultimate/testData/spring/core/generate/beanDependenciesByXml/factoryMethod-config.xml diff --git a/idea/testData/spring/core/generate/beanDependenciesByXml/factoryMethod-config.xml.after b/ultimate/testData/spring/core/generate/beanDependenciesByXml/factoryMethod-config.xml.after similarity index 100% rename from idea/testData/spring/core/generate/beanDependenciesByXml/factoryMethod-config.xml.after rename to ultimate/testData/spring/core/generate/beanDependenciesByXml/factoryMethod-config.xml.after diff --git a/idea/testData/spring/core/generate/beanDependenciesByXml/factoryMethod.kt.after b/ultimate/testData/spring/core/generate/beanDependenciesByXml/factoryMethod.kt.after similarity index 100% rename from idea/testData/spring/core/generate/beanDependenciesByXml/factoryMethod.kt.after rename to ultimate/testData/spring/core/generate/beanDependenciesByXml/factoryMethod.kt.after diff --git a/idea/testData/spring/core/generate/beanDependenciesByXml/factoryMethod.kt_disabled b/ultimate/testData/spring/core/generate/beanDependenciesByXml/factoryMethod.kt_disabled similarity index 100% rename from idea/testData/spring/core/generate/beanDependenciesByXml/factoryMethod.kt_disabled rename to ultimate/testData/spring/core/generate/beanDependenciesByXml/factoryMethod.kt_disabled diff --git a/idea/testData/spring/core/generate/beanDependenciesByXml/firstConstructor-config.xml b/ultimate/testData/spring/core/generate/beanDependenciesByXml/firstConstructor-config.xml similarity index 100% rename from idea/testData/spring/core/generate/beanDependenciesByXml/firstConstructor-config.xml rename to ultimate/testData/spring/core/generate/beanDependenciesByXml/firstConstructor-config.xml diff --git a/idea/testData/spring/core/generate/beanDependenciesByXml/firstConstructor-config.xml.after b/ultimate/testData/spring/core/generate/beanDependenciesByXml/firstConstructor-config.xml.after similarity index 100% rename from idea/testData/spring/core/generate/beanDependenciesByXml/firstConstructor-config.xml.after rename to ultimate/testData/spring/core/generate/beanDependenciesByXml/firstConstructor-config.xml.after diff --git a/idea/testData/spring/core/generate/beanDependenciesByXml/firstConstructor.kt b/ultimate/testData/spring/core/generate/beanDependenciesByXml/firstConstructor.kt similarity index 100% rename from idea/testData/spring/core/generate/beanDependenciesByXml/firstConstructor.kt rename to ultimate/testData/spring/core/generate/beanDependenciesByXml/firstConstructor.kt diff --git a/idea/testData/spring/core/generate/beanDependenciesByXml/firstConstructor.kt.after b/ultimate/testData/spring/core/generate/beanDependenciesByXml/firstConstructor.kt.after similarity index 100% rename from idea/testData/spring/core/generate/beanDependenciesByXml/firstConstructor.kt.after rename to ultimate/testData/spring/core/generate/beanDependenciesByXml/firstConstructor.kt.after diff --git a/idea/testData/spring/core/generate/beanDependenciesByXml/primaryConstructorAddParam-config.xml b/ultimate/testData/spring/core/generate/beanDependenciesByXml/primaryConstructorAddParam-config.xml similarity index 100% rename from idea/testData/spring/core/generate/beanDependenciesByXml/primaryConstructorAddParam-config.xml rename to ultimate/testData/spring/core/generate/beanDependenciesByXml/primaryConstructorAddParam-config.xml diff --git a/idea/testData/spring/core/generate/beanDependenciesByXml/primaryConstructorAddParam-config.xml.after b/ultimate/testData/spring/core/generate/beanDependenciesByXml/primaryConstructorAddParam-config.xml.after similarity index 100% rename from idea/testData/spring/core/generate/beanDependenciesByXml/primaryConstructorAddParam-config.xml.after rename to ultimate/testData/spring/core/generate/beanDependenciesByXml/primaryConstructorAddParam-config.xml.after diff --git a/idea/testData/spring/core/generate/beanDependenciesByXml/primaryConstructorAddParam.kt b/ultimate/testData/spring/core/generate/beanDependenciesByXml/primaryConstructorAddParam.kt similarity index 100% rename from idea/testData/spring/core/generate/beanDependenciesByXml/primaryConstructorAddParam.kt rename to ultimate/testData/spring/core/generate/beanDependenciesByXml/primaryConstructorAddParam.kt diff --git a/idea/testData/spring/core/generate/beanDependenciesByXml/primaryConstructorAddParam.kt.after b/ultimate/testData/spring/core/generate/beanDependenciesByXml/primaryConstructorAddParam.kt.after similarity index 100% rename from idea/testData/spring/core/generate/beanDependenciesByXml/primaryConstructorAddParam.kt.after rename to ultimate/testData/spring/core/generate/beanDependenciesByXml/primaryConstructorAddParam.kt.after diff --git a/idea/testData/spring/core/generate/beanDependenciesByXml/property-config.xml b/ultimate/testData/spring/core/generate/beanDependenciesByXml/property-config.xml similarity index 100% rename from idea/testData/spring/core/generate/beanDependenciesByXml/property-config.xml rename to ultimate/testData/spring/core/generate/beanDependenciesByXml/property-config.xml diff --git a/idea/testData/spring/core/generate/beanDependenciesByXml/property-config.xml.after b/ultimate/testData/spring/core/generate/beanDependenciesByXml/property-config.xml.after similarity index 100% rename from idea/testData/spring/core/generate/beanDependenciesByXml/property-config.xml.after rename to ultimate/testData/spring/core/generate/beanDependenciesByXml/property-config.xml.after diff --git a/idea/testData/spring/core/generate/beanDependenciesByXml/property.kt b/ultimate/testData/spring/core/generate/beanDependenciesByXml/property.kt similarity index 100% rename from idea/testData/spring/core/generate/beanDependenciesByXml/property.kt rename to ultimate/testData/spring/core/generate/beanDependenciesByXml/property.kt diff --git a/idea/testData/spring/core/generate/beanDependenciesByXml/property.kt.after b/ultimate/testData/spring/core/generate/beanDependenciesByXml/property.kt.after similarity index 100% rename from idea/testData/spring/core/generate/beanDependenciesByXml/property.kt.after rename to ultimate/testData/spring/core/generate/beanDependenciesByXml/property.kt.after diff --git a/idea/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructor-config.xml b/ultimate/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructor-config.xml similarity index 100% rename from idea/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructor-config.xml rename to ultimate/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructor-config.xml diff --git a/idea/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructor-config.xml.after b/ultimate/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructor-config.xml.after similarity index 100% rename from idea/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructor-config.xml.after rename to ultimate/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructor-config.xml.after diff --git a/idea/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructor.kt.after b/ultimate/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructor.kt.after similarity index 100% rename from idea/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructor.kt.after rename to ultimate/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructor.kt.after diff --git a/idea/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructor.kt_disabled b/ultimate/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructor.kt_disabled similarity index 100% rename from idea/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructor.kt_disabled rename to ultimate/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructor.kt_disabled diff --git a/idea/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructorAddParam-config.xml b/ultimate/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructorAddParam-config.xml similarity index 100% rename from idea/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructorAddParam-config.xml rename to ultimate/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructorAddParam-config.xml diff --git a/idea/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructorAddParam-config.xml.after b/ultimate/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructorAddParam-config.xml.after similarity index 100% rename from idea/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructorAddParam-config.xml.after rename to ultimate/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructorAddParam-config.xml.after diff --git a/idea/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructorAddParam.kt b/ultimate/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructorAddParam.kt similarity index 100% rename from idea/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructorAddParam.kt rename to ultimate/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructorAddParam.kt diff --git a/idea/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructorAddParam.kt.after b/ultimate/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructorAddParam.kt.after similarity index 100% rename from idea/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructorAddParam.kt.after rename to ultimate/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructorAddParam.kt.after diff --git a/idea/testData/spring/core/generate/beanDependenciesByXml/setter-config.xml b/ultimate/testData/spring/core/generate/beanDependenciesByXml/setter-config.xml similarity index 100% rename from idea/testData/spring/core/generate/beanDependenciesByXml/setter-config.xml rename to ultimate/testData/spring/core/generate/beanDependenciesByXml/setter-config.xml diff --git a/idea/testData/spring/core/generate/beanDependenciesByXml/setter-config.xml.after b/ultimate/testData/spring/core/generate/beanDependenciesByXml/setter-config.xml.after similarity index 100% rename from idea/testData/spring/core/generate/beanDependenciesByXml/setter-config.xml.after rename to ultimate/testData/spring/core/generate/beanDependenciesByXml/setter-config.xml.after diff --git a/idea/testData/spring/core/generate/beanDependenciesByXml/setter.kt b/ultimate/testData/spring/core/generate/beanDependenciesByXml/setter.kt similarity index 100% rename from idea/testData/spring/core/generate/beanDependenciesByXml/setter.kt rename to ultimate/testData/spring/core/generate/beanDependenciesByXml/setter.kt diff --git a/idea/testData/spring/core/generate/beanDependenciesByXml/setter.kt.after b/ultimate/testData/spring/core/generate/beanDependenciesByXml/setter.kt.after similarity index 100% rename from idea/testData/spring/core/generate/beanDependenciesByXml/setter.kt.after rename to ultimate/testData/spring/core/generate/beanDependenciesByXml/setter.kt.after diff --git a/idea/testData/spring/core/gutter/autowiredBeanCandidates/Bean.kt b/ultimate/testData/spring/core/gutter/autowiredBeanCandidates/Bean.kt similarity index 100% rename from idea/testData/spring/core/gutter/autowiredBeanCandidates/Bean.kt rename to ultimate/testData/spring/core/gutter/autowiredBeanCandidates/Bean.kt diff --git a/idea/testData/spring/core/gutter/autowiredBeanCandidates/autowiredBeanCandidates.test b/ultimate/testData/spring/core/gutter/autowiredBeanCandidates/autowiredBeanCandidates.test similarity index 100% rename from idea/testData/spring/core/gutter/autowiredBeanCandidates/autowiredBeanCandidates.test rename to ultimate/testData/spring/core/gutter/autowiredBeanCandidates/autowiredBeanCandidates.test diff --git a/idea/testData/spring/core/gutter/autowiredBeanCandidates/config.xml b/ultimate/testData/spring/core/gutter/autowiredBeanCandidates/config.xml similarity index 100% rename from idea/testData/spring/core/gutter/autowiredBeanCandidates/config.xml rename to ultimate/testData/spring/core/gutter/autowiredBeanCandidates/config.xml diff --git a/idea/testData/spring/core/gutter/autowiredProperty/Bean.kt b/ultimate/testData/spring/core/gutter/autowiredProperty/Bean.kt similarity index 100% rename from idea/testData/spring/core/gutter/autowiredProperty/Bean.kt rename to ultimate/testData/spring/core/gutter/autowiredProperty/Bean.kt diff --git a/idea/testData/spring/core/gutter/autowiredProperty/autowiredProperty.test b/ultimate/testData/spring/core/gutter/autowiredProperty/autowiredProperty.test similarity index 100% rename from idea/testData/spring/core/gutter/autowiredProperty/autowiredProperty.test rename to ultimate/testData/spring/core/gutter/autowiredProperty/autowiredProperty.test diff --git a/idea/testData/spring/core/gutter/autowiredProperty/config.xml b/ultimate/testData/spring/core/gutter/autowiredProperty/config.xml similarity index 100% rename from idea/testData/spring/core/gutter/autowiredProperty/config.xml rename to ultimate/testData/spring/core/gutter/autowiredProperty/config.xml diff --git a/idea/testData/spring/core/gutter/autowiredSetter/Bean.kt b/ultimate/testData/spring/core/gutter/autowiredSetter/Bean.kt similarity index 100% rename from idea/testData/spring/core/gutter/autowiredSetter/Bean.kt rename to ultimate/testData/spring/core/gutter/autowiredSetter/Bean.kt diff --git a/idea/testData/spring/core/gutter/autowiredSetter/autowiredSetter.test b/ultimate/testData/spring/core/gutter/autowiredSetter/autowiredSetter.test similarity index 100% rename from idea/testData/spring/core/gutter/autowiredSetter/autowiredSetter.test rename to ultimate/testData/spring/core/gutter/autowiredSetter/autowiredSetter.test diff --git a/idea/testData/spring/core/gutter/autowiredSetter/config.xml b/ultimate/testData/spring/core/gutter/autowiredSetter/config.xml similarity index 100% rename from idea/testData/spring/core/gutter/autowiredSetter/config.xml rename to ultimate/testData/spring/core/gutter/autowiredSetter/config.xml diff --git a/idea/testData/spring/core/gutter/classGutter/Bean.kt b/ultimate/testData/spring/core/gutter/classGutter/Bean.kt similarity index 100% rename from idea/testData/spring/core/gutter/classGutter/Bean.kt rename to ultimate/testData/spring/core/gutter/classGutter/Bean.kt diff --git a/idea/testData/spring/core/gutter/classGutter/classGutter.test b/ultimate/testData/spring/core/gutter/classGutter/classGutter.test similarity index 100% rename from idea/testData/spring/core/gutter/classGutter/classGutter.test rename to ultimate/testData/spring/core/gutter/classGutter/classGutter.test diff --git a/idea/testData/spring/core/gutter/classGutter/config.xml b/ultimate/testData/spring/core/gutter/classGutter/config.xml similarity index 100% rename from idea/testData/spring/core/gutter/classGutter/config.xml rename to ultimate/testData/spring/core/gutter/classGutter/config.xml diff --git a/idea/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/AbstractBean.kt b/ultimate/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/AbstractBean.kt similarity index 100% rename from idea/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/AbstractBean.kt rename to ultimate/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/AbstractBean.kt diff --git a/idea/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/AbstractBeanInheritor.kt b/ultimate/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/AbstractBeanInheritor.kt similarity index 100% rename from idea/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/AbstractBeanInheritor.kt rename to ultimate/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/AbstractBeanInheritor.kt diff --git a/idea/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/AbstractBeanInheritor2.kt b/ultimate/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/AbstractBeanInheritor2.kt similarity index 100% rename from idea/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/AbstractBeanInheritor2.kt rename to ultimate/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/AbstractBeanInheritor2.kt diff --git a/idea/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/classGutterAbstractShowMappedInheritors.test b/ultimate/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/classGutterAbstractShowMappedInheritors.test similarity index 100% rename from idea/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/classGutterAbstractShowMappedInheritors.test rename to ultimate/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/classGutterAbstractShowMappedInheritors.test diff --git a/idea/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/inheritors.xml b/ultimate/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/inheritors.xml similarity index 100% rename from idea/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/inheritors.xml rename to ultimate/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/inheritors.xml diff --git a/idea/testData/spring/core/gutter/componentScan/Bean.kt b/ultimate/testData/spring/core/gutter/componentScan/Bean.kt similarity index 100% rename from idea/testData/spring/core/gutter/componentScan/Bean.kt rename to ultimate/testData/spring/core/gutter/componentScan/Bean.kt diff --git a/idea/testData/spring/core/gutter/componentScan/ComponentScan.kt b/ultimate/testData/spring/core/gutter/componentScan/ComponentScan.kt similarity index 100% rename from idea/testData/spring/core/gutter/componentScan/ComponentScan.kt rename to ultimate/testData/spring/core/gutter/componentScan/ComponentScan.kt diff --git a/idea/testData/spring/core/gutter/componentScan/beans/MyController.kt b/ultimate/testData/spring/core/gutter/componentScan/beans/MyController.kt similarity index 100% rename from idea/testData/spring/core/gutter/componentScan/beans/MyController.kt rename to ultimate/testData/spring/core/gutter/componentScan/beans/MyController.kt diff --git a/idea/testData/spring/core/gutter/componentScan/beans/ResourceGutter.kt b/ultimate/testData/spring/core/gutter/componentScan/beans/ResourceGutter.kt similarity index 100% rename from idea/testData/spring/core/gutter/componentScan/beans/ResourceGutter.kt rename to ultimate/testData/spring/core/gutter/componentScan/beans/ResourceGutter.kt diff --git a/idea/testData/spring/core/gutter/componentScan/componentScan.test b/ultimate/testData/spring/core/gutter/componentScan/componentScan.test similarity index 100% rename from idea/testData/spring/core/gutter/componentScan/componentScan.test rename to ultimate/testData/spring/core/gutter/componentScan/componentScan.test diff --git a/idea/testData/spring/core/gutter/contextBeanInjectionPoints/ContextBeanInjectionPoints.kt b/ultimate/testData/spring/core/gutter/contextBeanInjectionPoints/ContextBeanInjectionPoints.kt similarity index 100% rename from idea/testData/spring/core/gutter/contextBeanInjectionPoints/ContextBeanInjectionPoints.kt rename to ultimate/testData/spring/core/gutter/contextBeanInjectionPoints/ContextBeanInjectionPoints.kt diff --git a/idea/testData/spring/core/gutter/contextBeanInjectionPoints/FooBar.kt b/ultimate/testData/spring/core/gutter/contextBeanInjectionPoints/FooBar.kt similarity index 100% rename from idea/testData/spring/core/gutter/contextBeanInjectionPoints/FooBar.kt rename to ultimate/testData/spring/core/gutter/contextBeanInjectionPoints/FooBar.kt diff --git a/idea/testData/spring/core/gutter/contextBeanInjectionPoints/contextBeanInjectionPoints.test b/ultimate/testData/spring/core/gutter/contextBeanInjectionPoints/contextBeanInjectionPoints.test similarity index 100% rename from idea/testData/spring/core/gutter/contextBeanInjectionPoints/contextBeanInjectionPoints.test rename to ultimate/testData/spring/core/gutter/contextBeanInjectionPoints/contextBeanInjectionPoints.test diff --git a/idea/testData/spring/core/gutter/contextBeanWithQualifierInjectionPoints/ContextBeanWithQualifierInjectionPoints.kt b/ultimate/testData/spring/core/gutter/contextBeanWithQualifierInjectionPoints/ContextBeanWithQualifierInjectionPoints.kt similarity index 100% rename from idea/testData/spring/core/gutter/contextBeanWithQualifierInjectionPoints/ContextBeanWithQualifierInjectionPoints.kt rename to ultimate/testData/spring/core/gutter/contextBeanWithQualifierInjectionPoints/ContextBeanWithQualifierInjectionPoints.kt diff --git a/idea/testData/spring/core/gutter/contextBeanWithQualifierInjectionPoints/FooBar.kt b/ultimate/testData/spring/core/gutter/contextBeanWithQualifierInjectionPoints/FooBar.kt similarity index 100% rename from idea/testData/spring/core/gutter/contextBeanWithQualifierInjectionPoints/FooBar.kt rename to ultimate/testData/spring/core/gutter/contextBeanWithQualifierInjectionPoints/FooBar.kt diff --git a/idea/testData/spring/core/gutter/contextBeanWithQualifierInjectionPoints/contextBeanWithQualifierInjectionPoints.test b/ultimate/testData/spring/core/gutter/contextBeanWithQualifierInjectionPoints/contextBeanWithQualifierInjectionPoints.test similarity index 100% rename from idea/testData/spring/core/gutter/contextBeanWithQualifierInjectionPoints/contextBeanWithQualifierInjectionPoints.test rename to ultimate/testData/spring/core/gutter/contextBeanWithQualifierInjectionPoints/contextBeanWithQualifierInjectionPoints.test diff --git a/idea/testData/spring/core/gutter/innerBean/InnerBean.kt b/ultimate/testData/spring/core/gutter/innerBean/InnerBean.kt similarity index 100% rename from idea/testData/spring/core/gutter/innerBean/InnerBean.kt rename to ultimate/testData/spring/core/gutter/innerBean/InnerBean.kt diff --git a/idea/testData/spring/core/gutter/innerBean/innerBean.test b/ultimate/testData/spring/core/gutter/innerBean/innerBean.test similarity index 100% rename from idea/testData/spring/core/gutter/innerBean/innerBean.test rename to ultimate/testData/spring/core/gutter/innerBean/innerBean.test diff --git a/idea/testData/spring/core/gutter/innerBean/innerBeanGutter.xml b/ultimate/testData/spring/core/gutter/innerBean/innerBeanGutter.xml similarity index 100% rename from idea/testData/spring/core/gutter/innerBean/innerBeanGutter.xml rename to ultimate/testData/spring/core/gutter/innerBean/innerBeanGutter.xml diff --git a/idea/testData/spring/core/gutter/methodTypeDefaultInitMethod/Bean.kt b/ultimate/testData/spring/core/gutter/methodTypeDefaultInitMethod/Bean.kt similarity index 100% rename from idea/testData/spring/core/gutter/methodTypeDefaultInitMethod/Bean.kt rename to ultimate/testData/spring/core/gutter/methodTypeDefaultInitMethod/Bean.kt diff --git a/idea/testData/spring/core/gutter/methodTypeDefaultInitMethod/config.xml b/ultimate/testData/spring/core/gutter/methodTypeDefaultInitMethod/config.xml similarity index 100% rename from idea/testData/spring/core/gutter/methodTypeDefaultInitMethod/config.xml rename to ultimate/testData/spring/core/gutter/methodTypeDefaultInitMethod/config.xml diff --git a/idea/testData/spring/core/gutter/methodTypeDefaultInitMethod/methodTypeDefaultInitMethod.test b/ultimate/testData/spring/core/gutter/methodTypeDefaultInitMethod/methodTypeDefaultInitMethod.test similarity index 100% rename from idea/testData/spring/core/gutter/methodTypeDefaultInitMethod/methodTypeDefaultInitMethod.test rename to ultimate/testData/spring/core/gutter/methodTypeDefaultInitMethod/methodTypeDefaultInitMethod.test diff --git a/idea/testData/spring/core/gutter/methodTypeFactory/Bean.kt b/ultimate/testData/spring/core/gutter/methodTypeFactory/Bean.kt similarity index 100% rename from idea/testData/spring/core/gutter/methodTypeFactory/Bean.kt rename to ultimate/testData/spring/core/gutter/methodTypeFactory/Bean.kt diff --git a/idea/testData/spring/core/gutter/methodTypeFactory/config.xml b/ultimate/testData/spring/core/gutter/methodTypeFactory/config.xml similarity index 100% rename from idea/testData/spring/core/gutter/methodTypeFactory/config.xml rename to ultimate/testData/spring/core/gutter/methodTypeFactory/config.xml diff --git a/idea/testData/spring/core/gutter/methodTypeFactory/methodTypeFactory.test b/ultimate/testData/spring/core/gutter/methodTypeFactory/methodTypeFactory.test similarity index 100% rename from idea/testData/spring/core/gutter/methodTypeFactory/methodTypeFactory.test rename to ultimate/testData/spring/core/gutter/methodTypeFactory/methodTypeFactory.test diff --git a/idea/testData/spring/core/gutter/methodTypeInitMethod/Bean.kt b/ultimate/testData/spring/core/gutter/methodTypeInitMethod/Bean.kt similarity index 100% rename from idea/testData/spring/core/gutter/methodTypeInitMethod/Bean.kt rename to ultimate/testData/spring/core/gutter/methodTypeInitMethod/Bean.kt diff --git a/idea/testData/spring/core/gutter/methodTypeInitMethod/config.xml b/ultimate/testData/spring/core/gutter/methodTypeInitMethod/config.xml similarity index 100% rename from idea/testData/spring/core/gutter/methodTypeInitMethod/config.xml rename to ultimate/testData/spring/core/gutter/methodTypeInitMethod/config.xml diff --git a/idea/testData/spring/core/gutter/methodTypeInitMethod/methodTypeInitMethod.test b/ultimate/testData/spring/core/gutter/methodTypeInitMethod/methodTypeInitMethod.test similarity index 100% rename from idea/testData/spring/core/gutter/methodTypeInitMethod/methodTypeInitMethod.test rename to ultimate/testData/spring/core/gutter/methodTypeInitMethod/methodTypeInitMethod.test diff --git a/idea/testData/spring/core/gutter/methodTypeMultiple/Bean.kt b/ultimate/testData/spring/core/gutter/methodTypeMultiple/Bean.kt similarity index 100% rename from idea/testData/spring/core/gutter/methodTypeMultiple/Bean.kt rename to ultimate/testData/spring/core/gutter/methodTypeMultiple/Bean.kt diff --git a/idea/testData/spring/core/gutter/methodTypeMultiple/config.xml b/ultimate/testData/spring/core/gutter/methodTypeMultiple/config.xml similarity index 100% rename from idea/testData/spring/core/gutter/methodTypeMultiple/config.xml rename to ultimate/testData/spring/core/gutter/methodTypeMultiple/config.xml diff --git a/idea/testData/spring/core/gutter/methodTypeMultiple/methodTypeMultiple.test b/ultimate/testData/spring/core/gutter/methodTypeMultiple/methodTypeMultiple.test similarity index 100% rename from idea/testData/spring/core/gutter/methodTypeMultiple/methodTypeMultiple.test rename to ultimate/testData/spring/core/gutter/methodTypeMultiple/methodTypeMultiple.test diff --git a/idea/testData/spring/core/gutter/propertyGutterForProperty/BeanWithProperties.kt b/ultimate/testData/spring/core/gutter/propertyGutterForProperty/BeanWithProperties.kt similarity index 100% rename from idea/testData/spring/core/gutter/propertyGutterForProperty/BeanWithProperties.kt rename to ultimate/testData/spring/core/gutter/propertyGutterForProperty/BeanWithProperties.kt diff --git a/idea/testData/spring/core/gutter/propertyGutterForProperty/propertyGutter.xml b/ultimate/testData/spring/core/gutter/propertyGutterForProperty/propertyGutter.xml similarity index 100% rename from idea/testData/spring/core/gutter/propertyGutterForProperty/propertyGutter.xml rename to ultimate/testData/spring/core/gutter/propertyGutterForProperty/propertyGutter.xml diff --git a/idea/testData/spring/core/gutter/propertyGutterForProperty/propertyGutterForProperty.test b/ultimate/testData/spring/core/gutter/propertyGutterForProperty/propertyGutterForProperty.test similarity index 100% rename from idea/testData/spring/core/gutter/propertyGutterForProperty/propertyGutterForProperty.test rename to ultimate/testData/spring/core/gutter/propertyGutterForProperty/propertyGutterForProperty.test diff --git a/idea/testData/spring/core/gutter/propertyGutterForSetter/BeanWithProperties.kt b/ultimate/testData/spring/core/gutter/propertyGutterForSetter/BeanWithProperties.kt similarity index 100% rename from idea/testData/spring/core/gutter/propertyGutterForSetter/BeanWithProperties.kt rename to ultimate/testData/spring/core/gutter/propertyGutterForSetter/BeanWithProperties.kt diff --git a/idea/testData/spring/core/gutter/propertyGutterForSetter/propertyGutter.xml b/ultimate/testData/spring/core/gutter/propertyGutterForSetter/propertyGutter.xml similarity index 100% rename from idea/testData/spring/core/gutter/propertyGutterForSetter/propertyGutter.xml rename to ultimate/testData/spring/core/gutter/propertyGutterForSetter/propertyGutter.xml diff --git a/idea/testData/spring/core/gutter/propertyGutterForSetter/propertyGutterForSetter.test b/ultimate/testData/spring/core/gutter/propertyGutterForSetter/propertyGutterForSetter.test similarity index 100% rename from idea/testData/spring/core/gutter/propertyGutterForSetter/propertyGutterForSetter.test rename to ultimate/testData/spring/core/gutter/propertyGutterForSetter/propertyGutterForSetter.test diff --git a/idea/testData/spring/core/gutter/resourceGutter/Bean.kt b/ultimate/testData/spring/core/gutter/resourceGutter/Bean.kt similarity index 100% rename from idea/testData/spring/core/gutter/resourceGutter/Bean.kt rename to ultimate/testData/spring/core/gutter/resourceGutter/Bean.kt diff --git a/idea/testData/spring/core/gutter/resourceGutter/Resource.kt b/ultimate/testData/spring/core/gutter/resourceGutter/Resource.kt similarity index 100% rename from idea/testData/spring/core/gutter/resourceGutter/Resource.kt rename to ultimate/testData/spring/core/gutter/resourceGutter/Resource.kt diff --git a/idea/testData/spring/core/gutter/resourceGutter/beans/ResourceGutter.kt b/ultimate/testData/spring/core/gutter/resourceGutter/beans/ResourceGutter.kt similarity index 100% rename from idea/testData/spring/core/gutter/resourceGutter/beans/ResourceGutter.kt rename to ultimate/testData/spring/core/gutter/resourceGutter/beans/ResourceGutter.kt diff --git a/idea/testData/spring/core/gutter/resourceGutter/resourceGutter.test b/ultimate/testData/spring/core/gutter/resourceGutter/resourceGutter.test similarity index 100% rename from idea/testData/spring/core/gutter/resourceGutter/resourceGutter.test rename to ultimate/testData/spring/core/gutter/resourceGutter/resourceGutter.test diff --git a/idea/testData/spring/core/gutter/resourceGutter/resourceGutter.xml b/ultimate/testData/spring/core/gutter/resourceGutter/resourceGutter.xml similarity index 100% rename from idea/testData/spring/core/gutter/resourceGutter/resourceGutter.xml rename to ultimate/testData/spring/core/gutter/resourceGutter/resourceGutter.xml diff --git a/idea/testData/spring/core/references/completion/handler/scopeReference.kt b/ultimate/testData/spring/core/references/completion/handler/scopeReference.kt similarity index 100% rename from idea/testData/spring/core/references/completion/handler/scopeReference.kt rename to ultimate/testData/spring/core/references/completion/handler/scopeReference.kt diff --git a/idea/testData/spring/core/references/completion/handler/scopeReference.kt.after b/ultimate/testData/spring/core/references/completion/handler/scopeReference.kt.after similarity index 100% rename from idea/testData/spring/core/references/completion/handler/scopeReference.kt.after rename to ultimate/testData/spring/core/references/completion/handler/scopeReference.kt.after diff --git a/idea/testData/spring/core/references/completion/handler/spring-config.xml b/ultimate/testData/spring/core/references/completion/handler/spring-config.xml similarity index 100% rename from idea/testData/spring/core/references/completion/handler/spring-config.xml rename to ultimate/testData/spring/core/references/completion/handler/spring-config.xml diff --git a/idea/testData/spring/core/references/completion/handler/springBeanReferenceEnter.kt b/ultimate/testData/spring/core/references/completion/handler/springBeanReferenceEnter.kt similarity index 100% rename from idea/testData/spring/core/references/completion/handler/springBeanReferenceEnter.kt rename to ultimate/testData/spring/core/references/completion/handler/springBeanReferenceEnter.kt diff --git a/idea/testData/spring/core/references/completion/handler/springBeanReferenceEnter.kt.after b/ultimate/testData/spring/core/references/completion/handler/springBeanReferenceEnter.kt.after similarity index 100% rename from idea/testData/spring/core/references/completion/handler/springBeanReferenceEnter.kt.after rename to ultimate/testData/spring/core/references/completion/handler/springBeanReferenceEnter.kt.after diff --git a/idea/testData/spring/core/references/completion/handler/springBeanReferenceTab.kt b/ultimate/testData/spring/core/references/completion/handler/springBeanReferenceTab.kt similarity index 100% rename from idea/testData/spring/core/references/completion/handler/springBeanReferenceTab.kt rename to ultimate/testData/spring/core/references/completion/handler/springBeanReferenceTab.kt diff --git a/idea/testData/spring/core/references/completion/handler/springBeanReferenceTab.kt.after b/ultimate/testData/spring/core/references/completion/handler/springBeanReferenceTab.kt.after similarity index 100% rename from idea/testData/spring/core/references/completion/handler/springBeanReferenceTab.kt.after rename to ultimate/testData/spring/core/references/completion/handler/springBeanReferenceTab.kt.after diff --git a/idea/testData/spring/core/references/completion/variants/scopeReference.kt b/ultimate/testData/spring/core/references/completion/variants/scopeReference.kt similarity index 100% rename from idea/testData/spring/core/references/completion/variants/scopeReference.kt rename to ultimate/testData/spring/core/references/completion/variants/scopeReference.kt diff --git a/idea/testData/spring/core/references/completion/variants/spring-config.xml b/ultimate/testData/spring/core/references/completion/variants/spring-config.xml similarity index 100% rename from idea/testData/spring/core/references/completion/variants/spring-config.xml rename to ultimate/testData/spring/core/references/completion/variants/spring-config.xml diff --git a/idea/testData/spring/core/references/completion/variants/springBeanReference.kt b/ultimate/testData/spring/core/references/completion/variants/springBeanReference.kt similarity index 100% rename from idea/testData/spring/core/references/completion/variants/springBeanReference.kt rename to ultimate/testData/spring/core/references/completion/variants/springBeanReference.kt diff --git a/idea/testData/spring/core/references/navigation/fileReferenceInClasspathResource.kt b/ultimate/testData/spring/core/references/navigation/fileReferenceInClasspathResource.kt similarity index 100% rename from idea/testData/spring/core/references/navigation/fileReferenceInClasspathResource.kt rename to ultimate/testData/spring/core/references/navigation/fileReferenceInClasspathResource.kt diff --git a/idea/testData/spring/core/references/navigation/fileReferenceInClasspathResource.test.xml b/ultimate/testData/spring/core/references/navigation/fileReferenceInClasspathResource.test.xml similarity index 100% rename from idea/testData/spring/core/references/navigation/fileReferenceInClasspathResource.test.xml rename to ultimate/testData/spring/core/references/navigation/fileReferenceInClasspathResource.test.xml diff --git a/idea/testData/spring/core/references/navigation/fileReferenceInClasspathXmlContext.kt b/ultimate/testData/spring/core/references/navigation/fileReferenceInClasspathXmlContext.kt similarity index 100% rename from idea/testData/spring/core/references/navigation/fileReferenceInClasspathXmlContext.kt rename to ultimate/testData/spring/core/references/navigation/fileReferenceInClasspathXmlContext.kt diff --git a/idea/testData/spring/core/references/navigation/fileReferenceInClasspathXmlContext.test.xml b/ultimate/testData/spring/core/references/navigation/fileReferenceInClasspathXmlContext.test.xml similarity index 100% rename from idea/testData/spring/core/references/navigation/fileReferenceInClasspathXmlContext.test.xml rename to ultimate/testData/spring/core/references/navigation/fileReferenceInClasspathXmlContext.test.xml diff --git a/idea/testData/spring/core/references/navigation/scopeReference.kt b/ultimate/testData/spring/core/references/navigation/scopeReference.kt similarity index 100% rename from idea/testData/spring/core/references/navigation/scopeReference.kt rename to ultimate/testData/spring/core/references/navigation/scopeReference.kt diff --git a/idea/testData/spring/core/references/navigation/scopeReference_config.xml b/ultimate/testData/spring/core/references/navigation/scopeReference_config.xml similarity index 100% rename from idea/testData/spring/core/references/navigation/scopeReference_config.xml rename to ultimate/testData/spring/core/references/navigation/scopeReference_config.xml diff --git a/idea/testData/spring/core/references/navigation/springBeanRefInFactoryContainsBean.kt b/ultimate/testData/spring/core/references/navigation/springBeanRefInFactoryContainsBean.kt similarity index 100% rename from idea/testData/spring/core/references/navigation/springBeanRefInFactoryContainsBean.kt rename to ultimate/testData/spring/core/references/navigation/springBeanRefInFactoryContainsBean.kt diff --git a/idea/testData/spring/core/references/navigation/springBeanRefInFactoryContainsBean_config.xml b/ultimate/testData/spring/core/references/navigation/springBeanRefInFactoryContainsBean_config.xml similarity index 100% rename from idea/testData/spring/core/references/navigation/springBeanRefInFactoryContainsBean_config.xml rename to ultimate/testData/spring/core/references/navigation/springBeanRefInFactoryContainsBean_config.xml diff --git a/idea/testData/spring/core/references/navigation/springBeanRefInFactoryGetBean.kt b/ultimate/testData/spring/core/references/navigation/springBeanRefInFactoryGetBean.kt similarity index 100% rename from idea/testData/spring/core/references/navigation/springBeanRefInFactoryGetBean.kt rename to ultimate/testData/spring/core/references/navigation/springBeanRefInFactoryGetBean.kt diff --git a/idea/testData/spring/core/references/navigation/springBeanRefInFactoryGetBean_config.xml b/ultimate/testData/spring/core/references/navigation/springBeanRefInFactoryGetBean_config.xml similarity index 100% rename from idea/testData/spring/core/references/navigation/springBeanRefInFactoryGetBean_config.xml rename to ultimate/testData/spring/core/references/navigation/springBeanRefInFactoryGetBean_config.xml diff --git a/idea/testData/spring/core/references/navigation/springBeanRefInResource.kt b/ultimate/testData/spring/core/references/navigation/springBeanRefInResource.kt similarity index 100% rename from idea/testData/spring/core/references/navigation/springBeanRefInResource.kt rename to ultimate/testData/spring/core/references/navigation/springBeanRefInResource.kt diff --git a/idea/testData/spring/core/references/navigation/springBeanRefInResource_config.xml b/ultimate/testData/spring/core/references/navigation/springBeanRefInResource_config.xml similarity index 100% rename from idea/testData/spring/core/references/navigation/springBeanRefInResource_config.xml rename to ultimate/testData/spring/core/references/navigation/springBeanRefInResource_config.xml diff --git a/idea/testData/spring/core/references/navigation/springFactoryBeanRefInResource.kt b/ultimate/testData/spring/core/references/navigation/springFactoryBeanRefInResource.kt similarity index 100% rename from idea/testData/spring/core/references/navigation/springFactoryBeanRefInResource.kt rename to ultimate/testData/spring/core/references/navigation/springFactoryBeanRefInResource.kt diff --git a/idea/testData/spring/core/references/navigation/springFactoryBeanRefInResource_config.xml b/ultimate/testData/spring/core/references/navigation/springFactoryBeanRefInResource_config.xml similarity index 100% rename from idea/testData/spring/core/references/navigation/springFactoryBeanRefInResource_config.xml rename to ultimate/testData/spring/core/references/navigation/springFactoryBeanRefInResource_config.xml diff --git a/idea/idea-ultimate/tests/org/jetbrains/kotlin/idea/codeInsight/UltimateInspectionTestGenerated.java b/ultimate/tests/org/jetbrains/kotlin/idea/codeInsight/UltimateInspectionTestGenerated.java similarity index 75% rename from idea/idea-ultimate/tests/org/jetbrains/kotlin/idea/codeInsight/UltimateInspectionTestGenerated.java rename to ultimate/tests/org/jetbrains/kotlin/idea/codeInsight/UltimateInspectionTestGenerated.java index db0de661cb5..006e9123b14 100644 --- a/idea/idea-ultimate/tests/org/jetbrains/kotlin/idea/codeInsight/UltimateInspectionTestGenerated.java +++ b/ultimate/tests/org/jetbrains/kotlin/idea/codeInsight/UltimateInspectionTestGenerated.java @@ -27,23 +27,23 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@TestMetadata("idea/testData/ultimateInspections") +@TestMetadata("ultimate/testData/inspections") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public class UltimateInspectionTestGenerated extends AbstractInspectionTest { - public void testAllFilesPresentInUltimateInspections() throws Exception { - KotlinTestUtils.assertAllTestsPresentInSingleGeneratedClass(this.getClass(), new File("idea/testData/ultimateInspections"), Pattern.compile("^(inspections\\.test)$")); + public void testAllFilesPresentInInspections() throws Exception { + KotlinTestUtils.assertAllTestsPresentInSingleGeneratedClass(this.getClass(), new File("ultimate/testData/inspections"), Pattern.compile("^(inspections\\.test)$")); } @TestMetadata("spring/finalSpringAnnotatedDeclaration/inspectionData/inspections.test") public void testSpring_finalSpringAnnotatedDeclaration_inspectionData_Inspections_test() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/ultimateInspections/spring/finalSpringAnnotatedDeclaration/inspectionData/inspections.test"); + String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/inspections/spring/finalSpringAnnotatedDeclaration/inspectionData/inspections.test"); doTest(fileName); } @TestMetadata("spring/unconfiguredFacet/inspectionData/inspections.test") public void testSpring_unconfiguredFacet_inspectionData_Inspections_test() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/ultimateInspections/spring/unconfiguredFacet/inspectionData/inspections.test"); + String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/inspections/spring/unconfiguredFacet/inspectionData/inspections.test"); doTest(fileName); } } diff --git a/idea/idea-ultimate/tests/org/jetbrains/kotlin/idea/quickfix/UltimateQuickFixTestGenerated.java b/ultimate/tests/org/jetbrains/kotlin/idea/quickfix/UltimateQuickFixTestGenerated.java similarity index 72% rename from idea/idea-ultimate/tests/org/jetbrains/kotlin/idea/quickfix/UltimateQuickFixTestGenerated.java rename to ultimate/tests/org/jetbrains/kotlin/idea/quickfix/UltimateQuickFixTestGenerated.java index bd81441132e..90c0646dbe6 100644 --- a/idea/idea-ultimate/tests/org/jetbrains/kotlin/idea/quickfix/UltimateQuickFixTestGenerated.java +++ b/ultimate/tests/org/jetbrains/kotlin/idea/quickfix/UltimateQuickFixTestGenerated.java @@ -27,69 +27,69 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@TestMetadata("idea/testData/ultimateQuickFixes") +@TestMetadata("ultimate/testData/quickFixes") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public class UltimateQuickFixTestGenerated extends AbstractQuickFixTest { - public void testAllFilesPresentInUltimateQuickFixes() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/ultimateQuickFixes"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + public void testAllFilesPresentInQuickFixes() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("ultimate/testData/quickFixes"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } - @TestMetadata("idea/testData/ultimateQuickFixes/spring") + @TestMetadata("ultimate/testData/quickFixes/spring") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class Spring extends AbstractQuickFixTest { public void testAllFilesPresentInSpring() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/ultimateQuickFixes/spring"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("ultimate/testData/quickFixes/spring"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } - @TestMetadata("idea/testData/ultimateQuickFixes/spring/finalSpringAnnotatedDeclaration") + @TestMetadata("ultimate/testData/quickFixes/spring/finalSpringAnnotatedDeclaration") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class FinalSpringAnnotatedDeclaration extends AbstractQuickFixTest { public void testAllFilesPresentInFinalSpringAnnotatedDeclaration() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/ultimateQuickFixes/spring/finalSpringAnnotatedDeclaration"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("ultimate/testData/quickFixes/spring/finalSpringAnnotatedDeclaration"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("classWithComponentRuntime.kt") public void testClassWithComponentRuntime() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/ultimateQuickFixes/spring/finalSpringAnnotatedDeclaration/classWithComponentRuntime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/quickFixes/spring/finalSpringAnnotatedDeclaration/classWithComponentRuntime.kt"); doTest(fileName); } @TestMetadata("classWithConfigurationRuntime.kt") public void testClassWithConfigurationRuntime() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/ultimateQuickFixes/spring/finalSpringAnnotatedDeclaration/classWithConfigurationRuntime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/quickFixes/spring/finalSpringAnnotatedDeclaration/classWithConfigurationRuntime.kt"); doTest(fileName); } @TestMetadata("classWithCustomConfigurationRuntime.kt") public void testClassWithCustomConfigurationRuntime() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/ultimateQuickFixes/spring/finalSpringAnnotatedDeclaration/classWithCustomConfigurationRuntime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/quickFixes/spring/finalSpringAnnotatedDeclaration/classWithCustomConfigurationRuntime.kt"); doTest(fileName); } @TestMetadata("funWithBeanFinalClassRuntime.kt") public void testFunWithBeanFinalClassRuntime() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/ultimateQuickFixes/spring/finalSpringAnnotatedDeclaration/funWithBeanFinalClassRuntime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/quickFixes/spring/finalSpringAnnotatedDeclaration/funWithBeanFinalClassRuntime.kt"); doTest(fileName); } @TestMetadata("funWithBeanOpenClassRuntime.kt") public void testFunWithBeanOpenClassRuntime() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/ultimateQuickFixes/spring/finalSpringAnnotatedDeclaration/funWithBeanOpenClassRuntime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/quickFixes/spring/finalSpringAnnotatedDeclaration/funWithBeanOpenClassRuntime.kt"); doTest(fileName); } @TestMetadata("funWithCustomBeanFinalClassRuntime.kt") public void testFunWithCustomBeanFinalClassRuntime() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/ultimateQuickFixes/spring/finalSpringAnnotatedDeclaration/funWithCustomBeanFinalClassRuntime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/quickFixes/spring/finalSpringAnnotatedDeclaration/funWithCustomBeanFinalClassRuntime.kt"); doTest(fileName); } @TestMetadata("funWithCustomBeanOpenClassRuntime.kt") public void testFunWithCustomBeanOpenClassRuntime() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/ultimateQuickFixes/spring/finalSpringAnnotatedDeclaration/funWithCustomBeanOpenClassRuntime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/quickFixes/spring/finalSpringAnnotatedDeclaration/funWithCustomBeanOpenClassRuntime.kt"); doTest(fileName); } } diff --git a/idea/idea-ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/SpringTestFixtureExtension.kt b/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/SpringTestFixtureExtension.kt similarity index 93% rename from idea/idea-ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/SpringTestFixtureExtension.kt rename to ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/SpringTestFixtureExtension.kt index 4b8a02a3f87..ba1d96cf48a 100644 --- a/idea/idea-ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/SpringTestFixtureExtension.kt +++ b/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/SpringTestFixtureExtension.kt @@ -22,9 +22,8 @@ import com.intellij.spring.facet.SpringFacet import com.intellij.spring.facet.SpringFileSet import com.intellij.testFramework.fixtures.CodeInsightTestFixture import org.jetbrains.kotlin.idea.test.ConfigLibraryUtil -import org.jetbrains.kotlin.idea.test.PluginTestCaseBase import org.jetbrains.kotlin.idea.test.TestFixtureExtension -import org.jetbrains.kotlin.test.KotlinTestUtils +import org.jetbrains.kotlin.tests.ULTIMATE_TEST_ROOT import java.util.* @Suppress("unused") @@ -38,7 +37,7 @@ class SpringTestFixtureExtension() : TestFixtureExtension { ) } - val SPRING_LIBRARY_ROOT = "${KotlinTestUtils.getHomeDirectory()}/dependencies/spring" + val SPRING_LIBRARY_ROOT = "$ULTIMATE_TEST_ROOT/dependencies/spring" override fun setUp(module: Module) { this.module = module diff --git a/idea/idea-ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/generate/AbstractGenerateSpringDependencyActionTest.kt b/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/generate/AbstractGenerateSpringDependencyActionTest.kt similarity index 100% rename from idea/idea-ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/generate/AbstractGenerateSpringDependencyActionTest.kt rename to ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/generate/AbstractGenerateSpringDependencyActionTest.kt diff --git a/idea/idea-ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/generate/GenerateSpringDependencyActionTestGenerated.java b/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/generate/GenerateSpringDependencyActionTestGenerated.java similarity index 64% rename from idea/idea-ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/generate/GenerateSpringDependencyActionTestGenerated.java rename to ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/generate/GenerateSpringDependencyActionTestGenerated.java index a2ce2d0c364..50430df7051 100644 --- a/idea/idea-ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/generate/GenerateSpringDependencyActionTestGenerated.java +++ b/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/generate/GenerateSpringDependencyActionTestGenerated.java @@ -27,89 +27,89 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@TestMetadata("idea/testData/spring/core/generate") +@TestMetadata("ultimate/testData/spring/core/generate") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public class GenerateSpringDependencyActionTestGenerated extends AbstractGenerateSpringDependencyActionTest { public void testAllFilesPresentInGenerate() throws Exception { - KotlinTestUtils.assertAllTestsPresentInSingleGeneratedClass(this.getClass(), new File("idea/testData/spring/core/generate"), Pattern.compile("^([\\w]+)\\.kt$")); + KotlinTestUtils.assertAllTestsPresentInSingleGeneratedClass(this.getClass(), new File("ultimate/testData/spring/core/generate"), Pattern.compile("^([\\w]+)\\.kt$")); } @TestMetadata("autowiredDependencies/duplicatingPropertyAnnotationConfig.kt") public void testAutowiredDependencies_DuplicatingPropertyAnnotationConfig() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/spring/core/generate/autowiredDependencies/duplicatingPropertyAnnotationConfig.kt"); + String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/generate/autowiredDependencies/duplicatingPropertyAnnotationConfig.kt"); doTest(fileName); } @TestMetadata("autowiredDependencies/duplicatingPropertyXmlConfig.kt") public void testAutowiredDependencies_DuplicatingPropertyXmlConfig() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/spring/core/generate/autowiredDependencies/duplicatingPropertyXmlConfig.kt"); + String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/generate/autowiredDependencies/duplicatingPropertyXmlConfig.kt"); doTest(fileName); } @TestMetadata("autowiredDependencies/multiplePropertiesAnnotationConfig.kt") public void testAutowiredDependencies_MultiplePropertiesAnnotationConfig() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/spring/core/generate/autowiredDependencies/multiplePropertiesAnnotationConfig.kt"); + String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/generate/autowiredDependencies/multiplePropertiesAnnotationConfig.kt"); doTest(fileName); } @TestMetadata("autowiredDependencies/multiplePropertiesXmlConfig.kt") public void testAutowiredDependencies_MultiplePropertiesXmlConfig() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/spring/core/generate/autowiredDependencies/multiplePropertiesXmlConfig.kt"); + String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/generate/autowiredDependencies/multiplePropertiesXmlConfig.kt"); doTest(fileName); } @TestMetadata("autowiredDependencies/propertyWithQualifierAnnotationConfig.kt") public void testAutowiredDependencies_PropertyWithQualifierAnnotationConfig() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/spring/core/generate/autowiredDependencies/propertyWithQualifierAnnotationConfig.kt"); + String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/generate/autowiredDependencies/propertyWithQualifierAnnotationConfig.kt"); doTest(fileName); } @TestMetadata("autowiredDependencies/propertyWithQualifierXmlConfig.kt") public void testAutowiredDependencies_PropertyWithQualifierXmlConfig() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/spring/core/generate/autowiredDependencies/propertyWithQualifierXmlConfig.kt"); + String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/generate/autowiredDependencies/propertyWithQualifierXmlConfig.kt"); doTest(fileName); } @TestMetadata("autowiredDependencies/singlePropertyAnnotationConfig.kt") public void testAutowiredDependencies_SinglePropertyAnnotationConfig() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/spring/core/generate/autowiredDependencies/singlePropertyAnnotationConfig.kt"); + String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/generate/autowiredDependencies/singlePropertyAnnotationConfig.kt"); doTest(fileName); } @TestMetadata("autowiredDependencies/singlePropertyXmlConfig.kt") public void testAutowiredDependencies_SinglePropertyXmlConfig() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/spring/core/generate/autowiredDependencies/singlePropertyXmlConfig.kt"); + String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/generate/autowiredDependencies/singlePropertyXmlConfig.kt"); doTest(fileName); } @TestMetadata("beanDependenciesByXml/firstConstructor.kt") public void testBeanDependenciesByXml_FirstConstructor() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/spring/core/generate/beanDependenciesByXml/firstConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/generate/beanDependenciesByXml/firstConstructor.kt"); doTest(fileName); } @TestMetadata("beanDependenciesByXml/primaryConstructorAddParam.kt") public void testBeanDependenciesByXml_PrimaryConstructorAddParam() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/spring/core/generate/beanDependenciesByXml/primaryConstructorAddParam.kt"); + String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/generate/beanDependenciesByXml/primaryConstructorAddParam.kt"); doTest(fileName); } @TestMetadata("beanDependenciesByXml/property.kt") public void testBeanDependenciesByXml_Property() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/spring/core/generate/beanDependenciesByXml/property.kt"); + String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/generate/beanDependenciesByXml/property.kt"); doTest(fileName); } @TestMetadata("beanDependenciesByXml/secondaryConstructorAddParam.kt") public void testBeanDependenciesByXml_SecondaryConstructorAddParam() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructorAddParam.kt"); + String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructorAddParam.kt"); doTest(fileName); } @TestMetadata("beanDependenciesByXml/setter.kt") public void testBeanDependenciesByXml_Setter() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/spring/core/generate/beanDependenciesByXml/setter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/generate/beanDependenciesByXml/setter.kt"); doTest(fileName); } } diff --git a/idea/idea-ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/gutter/AbstractSpringClassAnnotatorTest.kt b/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/gutter/AbstractSpringClassAnnotatorTest.kt similarity index 98% rename from idea/idea-ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/gutter/AbstractSpringClassAnnotatorTest.kt rename to ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/gutter/AbstractSpringClassAnnotatorTest.kt index 5968514fc60..3da7ba81172 100644 --- a/idea/idea-ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/gutter/AbstractSpringClassAnnotatorTest.kt +++ b/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/gutter/AbstractSpringClassAnnotatorTest.kt @@ -20,7 +20,6 @@ import com.google.gson.JsonArray import com.google.gson.JsonObject import com.google.gson.JsonParser import com.intellij.openapi.util.io.FileUtil -import com.intellij.testFramework.LightProjectDescriptor import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase import icons.SpringApiIcons import org.jetbrains.kotlin.idea.jsonUtils.getString diff --git a/idea/idea-ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/gutter/SpringClassAnnotatorTestGenerated.java b/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/gutter/SpringClassAnnotatorTestGenerated.java similarity index 63% rename from idea/idea-ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/gutter/SpringClassAnnotatorTestGenerated.java rename to ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/gutter/SpringClassAnnotatorTestGenerated.java index e334465c487..6da0890cde4 100644 --- a/idea/idea-ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/gutter/SpringClassAnnotatorTestGenerated.java +++ b/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/gutter/SpringClassAnnotatorTestGenerated.java @@ -27,107 +27,107 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@TestMetadata("idea/testData/spring/core/gutter") +@TestMetadata("ultimate/testData/spring/core/gutter") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public class SpringClassAnnotatorTestGenerated extends AbstractSpringClassAnnotatorTest { public void testAllFilesPresentInGutter() throws Exception { - KotlinTestUtils.assertAllTestsPresentInSingleGeneratedClass(this.getClass(), new File("idea/testData/spring/core/gutter"), Pattern.compile("^(.+)\\.test$")); + KotlinTestUtils.assertAllTestsPresentInSingleGeneratedClass(this.getClass(), new File("ultimate/testData/spring/core/gutter"), Pattern.compile("^(.+)\\.test$")); } @TestMetadata("autowiredBeanCandidates/autowiredBeanCandidates.test") public void testAutowiredBeanCandidates_AutowiredBeanCandidates() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/spring/core/gutter/autowiredBeanCandidates/autowiredBeanCandidates.test"); + String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/gutter/autowiredBeanCandidates/autowiredBeanCandidates.test"); doTest(fileName); } @TestMetadata("autowiredProperty/autowiredProperty.test") public void testAutowiredProperty_AutowiredProperty() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/spring/core/gutter/autowiredProperty/autowiredProperty.test"); + String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/gutter/autowiredProperty/autowiredProperty.test"); doTest(fileName); } @TestMetadata("autowiredSetter/autowiredSetter.test") public void testAutowiredSetter_AutowiredSetter() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/spring/core/gutter/autowiredSetter/autowiredSetter.test"); + String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/gutter/autowiredSetter/autowiredSetter.test"); doTest(fileName); } @TestMetadata("classGutter/classGutter.test") public void testClassGutter_ClassGutter() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/spring/core/gutter/classGutter/classGutter.test"); + String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/gutter/classGutter/classGutter.test"); doTest(fileName); } @TestMetadata("classGutterAbstractShowMappedInheritors/classGutterAbstractShowMappedInheritors.test") public void testClassGutterAbstractShowMappedInheritors_ClassGutterAbstractShowMappedInheritors() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/classGutterAbstractShowMappedInheritors.test"); + String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/classGutterAbstractShowMappedInheritors.test"); doTest(fileName); } @TestMetadata("componentScan/componentScan.test") public void testComponentScan_ComponentScan() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/spring/core/gutter/componentScan/componentScan.test"); + String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/gutter/componentScan/componentScan.test"); doTest(fileName); } @TestMetadata("contextBeanInjectionPoints/contextBeanInjectionPoints.test") public void testContextBeanInjectionPoints_ContextBeanInjectionPoints() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/spring/core/gutter/contextBeanInjectionPoints/contextBeanInjectionPoints.test"); + String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/gutter/contextBeanInjectionPoints/contextBeanInjectionPoints.test"); doTest(fileName); } @TestMetadata("contextBeanWithQualifierInjectionPoints/contextBeanWithQualifierInjectionPoints.test") public void testContextBeanWithQualifierInjectionPoints_ContextBeanWithQualifierInjectionPoints() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/spring/core/gutter/contextBeanWithQualifierInjectionPoints/contextBeanWithQualifierInjectionPoints.test"); + String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/gutter/contextBeanWithQualifierInjectionPoints/contextBeanWithQualifierInjectionPoints.test"); doTest(fileName); } @TestMetadata("innerBean/innerBean.test") public void testInnerBean_InnerBean() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/spring/core/gutter/innerBean/innerBean.test"); + String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/gutter/innerBean/innerBean.test"); doTest(fileName); } @TestMetadata("methodTypeDefaultInitMethod/methodTypeDefaultInitMethod.test") public void testMethodTypeDefaultInitMethod_MethodTypeDefaultInitMethod() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/spring/core/gutter/methodTypeDefaultInitMethod/methodTypeDefaultInitMethod.test"); + String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/gutter/methodTypeDefaultInitMethod/methodTypeDefaultInitMethod.test"); doTest(fileName); } @TestMetadata("methodTypeFactory/methodTypeFactory.test") public void testMethodTypeFactory_MethodTypeFactory() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/spring/core/gutter/methodTypeFactory/methodTypeFactory.test"); + String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/gutter/methodTypeFactory/methodTypeFactory.test"); doTest(fileName); } @TestMetadata("methodTypeInitMethod/methodTypeInitMethod.test") public void testMethodTypeInitMethod_MethodTypeInitMethod() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/spring/core/gutter/methodTypeInitMethod/methodTypeInitMethod.test"); + String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/gutter/methodTypeInitMethod/methodTypeInitMethod.test"); doTest(fileName); } @TestMetadata("methodTypeMultiple/methodTypeMultiple.test") public void testMethodTypeMultiple_MethodTypeMultiple() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/spring/core/gutter/methodTypeMultiple/methodTypeMultiple.test"); + String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/gutter/methodTypeMultiple/methodTypeMultiple.test"); doTest(fileName); } @TestMetadata("propertyGutterForProperty/propertyGutterForProperty.test") public void testPropertyGutterForProperty_PropertyGutterForProperty() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/spring/core/gutter/propertyGutterForProperty/propertyGutterForProperty.test"); + String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/gutter/propertyGutterForProperty/propertyGutterForProperty.test"); doTest(fileName); } @TestMetadata("propertyGutterForSetter/propertyGutterForSetter.test") public void testPropertyGutterForSetter_PropertyGutterForSetter() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/spring/core/gutter/propertyGutterForSetter/propertyGutterForSetter.test"); + String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/gutter/propertyGutterForSetter/propertyGutterForSetter.test"); doTest(fileName); } @TestMetadata("resourceGutter/resourceGutter.test") public void testResourceGutter_ResourceGutter() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/spring/core/gutter/resourceGutter/resourceGutter.test"); + String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/gutter/resourceGutter/resourceGutter.test"); doTest(fileName); } } diff --git a/idea/idea-ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/gutter/springGutterTestUtils.kt b/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/gutter/springGutterTestUtils.kt similarity index 100% rename from idea/idea-ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/gutter/springGutterTestUtils.kt rename to ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/gutter/springGutterTestUtils.kt diff --git a/idea/idea-ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/references/AbstractSpringReferenceCompletionHandlerTest.kt b/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/references/AbstractSpringReferenceCompletionHandlerTest.kt similarity index 100% rename from idea/idea-ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/references/AbstractSpringReferenceCompletionHandlerTest.kt rename to ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/references/AbstractSpringReferenceCompletionHandlerTest.kt diff --git a/idea/idea-ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/references/AbstractSpringReferenceCompletionTest.kt b/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/references/AbstractSpringReferenceCompletionTest.kt similarity index 99% rename from idea/idea-ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/references/AbstractSpringReferenceCompletionTest.kt rename to ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/references/AbstractSpringReferenceCompletionTest.kt index b0fa8cb070c..53ba8756c94 100644 --- a/idea/idea-ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/references/AbstractSpringReferenceCompletionTest.kt +++ b/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/references/AbstractSpringReferenceCompletionTest.kt @@ -27,7 +27,7 @@ abstract class AbstractSpringReferenceCompletionTest : AbstractJvmBasicCompletio super.setUpFixture(testPath) TestFixtureExtension - .loadFixture(myModule)!! + .loadFixture(myModule) .configureFileSet(myFixture, listOf(PathUtil.toSystemIndependentName(File(testPath).parent + "/spring-config.xml"))) } diff --git a/idea/idea-ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/references/AbstractSpringReferenceNavigationTest.kt b/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/references/AbstractSpringReferenceNavigationTest.kt similarity index 100% rename from idea/idea-ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/references/AbstractSpringReferenceNavigationTest.kt rename to ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/references/AbstractSpringReferenceNavigationTest.kt diff --git a/idea/idea-ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/references/SpringReferenceCompletionHandlerTestGenerated.java b/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/references/SpringReferenceCompletionHandlerTestGenerated.java similarity index 74% rename from idea/idea-ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/references/SpringReferenceCompletionHandlerTestGenerated.java rename to ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/references/SpringReferenceCompletionHandlerTestGenerated.java index 13eeb71a123..1e4bccc5bab 100644 --- a/idea/idea-ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/references/SpringReferenceCompletionHandlerTestGenerated.java +++ b/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/references/SpringReferenceCompletionHandlerTestGenerated.java @@ -27,29 +27,29 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@TestMetadata("idea/testData/spring/core/references/completion/handler") +@TestMetadata("ultimate/testData/spring/core/references/completion/handler") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public class SpringReferenceCompletionHandlerTestGenerated extends AbstractSpringReferenceCompletionHandlerTest { public void testAllFilesPresentInHandler() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/spring/core/references/completion/handler"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("ultimate/testData/spring/core/references/completion/handler"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("scopeReference.kt") public void testScopeReference() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/spring/core/references/completion/handler/scopeReference.kt"); + String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/references/completion/handler/scopeReference.kt"); doTest(fileName); } @TestMetadata("springBeanReferenceEnter.kt") public void testSpringBeanReferenceEnter() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/spring/core/references/completion/handler/springBeanReferenceEnter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/references/completion/handler/springBeanReferenceEnter.kt"); doTest(fileName); } @TestMetadata("springBeanReferenceTab.kt") public void testSpringBeanReferenceTab() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/spring/core/references/completion/handler/springBeanReferenceTab.kt"); + String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/references/completion/handler/springBeanReferenceTab.kt"); doTest(fileName); } } diff --git a/idea/idea-ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/references/SpringReferenceCompletionTestGenerated.java b/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/references/SpringReferenceCompletionTestGenerated.java similarity index 77% rename from idea/idea-ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/references/SpringReferenceCompletionTestGenerated.java rename to ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/references/SpringReferenceCompletionTestGenerated.java index 7ae8b2ce091..f23764fb260 100644 --- a/idea/idea-ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/references/SpringReferenceCompletionTestGenerated.java +++ b/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/references/SpringReferenceCompletionTestGenerated.java @@ -27,23 +27,23 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@TestMetadata("idea/testData/spring/core/references/completion/variants") +@TestMetadata("ultimate/testData/spring/core/references/completion/variants") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public class SpringReferenceCompletionTestGenerated extends AbstractSpringReferenceCompletionTest { public void testAllFilesPresentInVariants() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/spring/core/references/completion/variants"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("ultimate/testData/spring/core/references/completion/variants"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("scopeReference.kt") public void testScopeReference() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/spring/core/references/completion/variants/scopeReference.kt"); + String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/references/completion/variants/scopeReference.kt"); doTest(fileName); } @TestMetadata("springBeanReference.kt") public void testSpringBeanReference() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/spring/core/references/completion/variants/springBeanReference.kt"); + String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/references/completion/variants/springBeanReference.kt"); doTest(fileName); } } diff --git a/idea/idea-ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/references/SpringReferenceNavigationTestGenerated.java b/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/references/SpringReferenceNavigationTestGenerated.java similarity index 67% rename from idea/idea-ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/references/SpringReferenceNavigationTestGenerated.java rename to ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/references/SpringReferenceNavigationTestGenerated.java index 1edd7c95cc7..5f1edb48049 100644 --- a/idea/idea-ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/references/SpringReferenceNavigationTestGenerated.java +++ b/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/references/SpringReferenceNavigationTestGenerated.java @@ -27,53 +27,53 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@TestMetadata("idea/testData/spring/core/references/navigation") +@TestMetadata("ultimate/testData/spring/core/references/navigation") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public class SpringReferenceNavigationTestGenerated extends AbstractSpringReferenceNavigationTest { public void testAllFilesPresentInNavigation() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/spring/core/references/navigation"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("ultimate/testData/spring/core/references/navigation"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("fileReferenceInClasspathResource.kt") public void testFileReferenceInClasspathResource() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/spring/core/references/navigation/fileReferenceInClasspathResource.kt"); + String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/references/navigation/fileReferenceInClasspathResource.kt"); doTest(fileName); } @TestMetadata("fileReferenceInClasspathXmlContext.kt") public void testFileReferenceInClasspathXmlContext() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/spring/core/references/navigation/fileReferenceInClasspathXmlContext.kt"); + String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/references/navigation/fileReferenceInClasspathXmlContext.kt"); doTest(fileName); } @TestMetadata("scopeReference.kt") public void testScopeReference() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/spring/core/references/navigation/scopeReference.kt"); + String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/references/navigation/scopeReference.kt"); doTest(fileName); } @TestMetadata("springBeanRefInFactoryContainsBean.kt") public void testSpringBeanRefInFactoryContainsBean() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/spring/core/references/navigation/springBeanRefInFactoryContainsBean.kt"); + String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/references/navigation/springBeanRefInFactoryContainsBean.kt"); doTest(fileName); } @TestMetadata("springBeanRefInFactoryGetBean.kt") public void testSpringBeanRefInFactoryGetBean() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/spring/core/references/navigation/springBeanRefInFactoryGetBean.kt"); + String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/references/navigation/springBeanRefInFactoryGetBean.kt"); doTest(fileName); } @TestMetadata("springBeanRefInResource.kt") public void testSpringBeanRefInResource() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/spring/core/references/navigation/springBeanRefInResource.kt"); + String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/references/navigation/springBeanRefInResource.kt"); doTest(fileName); } @TestMetadata("springFactoryBeanRefInResource.kt") public void testSpringFactoryBeanRefInResource() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/spring/core/references/navigation/springFactoryBeanRefInResource.kt"); + String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/references/navigation/springFactoryBeanRefInResource.kt"); doTest(fileName); } } diff --git a/ultimate/tests/org/jetbrains/kotlin/tests/GenerateTests.kt b/ultimate/tests/org/jetbrains/kotlin/tests/GenerateTests.kt new file mode 100644 index 00000000000..f6939eab41d --- /dev/null +++ b/ultimate/tests/org/jetbrains/kotlin/tests/GenerateTests.kt @@ -0,0 +1,60 @@ +/* + * Copyright 2010-2016 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.jetbrains.kotlin.tests + +import org.jetbrains.kotlin.generators.tests.testGroup +import org.jetbrains.kotlin.idea.codeInsight.AbstractInspectionTest +import org.jetbrains.kotlin.idea.quickfix.AbstractQuickFixTest +import org.jetbrains.kotlin.idea.spring.tests.generate.AbstractGenerateSpringDependencyActionTest +import org.jetbrains.kotlin.idea.spring.tests.gutter.AbstractSpringClassAnnotatorTest +import org.jetbrains.kotlin.idea.spring.tests.references.AbstractSpringReferenceCompletionHandlerTest +import org.jetbrains.kotlin.idea.spring.tests.references.AbstractSpringReferenceCompletionTest +import org.jetbrains.kotlin.idea.spring.tests.references.AbstractSpringReferenceNavigationTest + +fun main(args: Array) { + System.setProperty("java.awt.headless", "true") + + testGroup("ultimate/tests", "ultimate/testData") { + testClass("UltimateInspectionTestGenerated") { + model("inspections", pattern = "^(inspections\\.test)$", singleClass = true) + } + + testClass("UltimateQuickFixTestGenerated") { + model("quickFixes", pattern = "^([\\w\\-_]+)\\.kt$", filenameStartsLowerCase = true) + } + + testClass() { + model("spring/core/gutter", extension = "test", singleClass = true) + } + + testClass() { + model("spring/core/references/completion/handler") + } + + testClass() { + model("spring/core/references/completion/variants") + } + + testClass() { + model("spring/core/references/navigation") + } + + testClass() { + model("spring/core/generate", pattern = "^([\\w]+)\\.kt$", singleClass = true) + } + } +} diff --git a/ultimate/tests/org/jetbrains/kotlin/tests/testUtils.kt b/ultimate/tests/org/jetbrains/kotlin/tests/testUtils.kt new file mode 100644 index 00000000000..5575f26c26c --- /dev/null +++ b/ultimate/tests/org/jetbrains/kotlin/tests/testUtils.kt @@ -0,0 +1,22 @@ +/* + * Copyright 2010-2016 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.jetbrains.kotlin.tests + +import org.jetbrains.kotlin.test.KotlinTestUtils + +val ULTIMATE_TEST_ROOT: String + get() = "${KotlinTestUtils.getHomeDirectory()}/ultimate" diff --git a/ultimate/update_dependencies.xml b/ultimate/update_dependencies.xml new file mode 100644 index 00000000000..530e3d6b429 --- /dev/null +++ b/ultimate/update_dependencies.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/update_dependencies.xml b/update_dependencies.xml index 44b0cf67436..2557c03b4f5 100644 --- a/update_dependencies.xml +++ b/update_dependencies.xml @@ -14,7 +14,7 @@ - + @@ -139,21 +139,6 @@ - - - - - - - - - @@ -196,10 +181,12 @@ - + + + @@ -338,12 +325,6 @@ - - - - - -