Ultimate tests repair (KT-18847)
Repaired all except: GenerateSpringDependencyActionTestGenerated.testAutowiredDependencies_MultiplePropertiesAnnotationConfig - Not a Kotlin issue SpringClassAnnotatorTestGenerated.testAutowiredBeanCandidates_AutowiredBeanCandidates - Bug with multiple light objects for same PSI element SpringInspectionTestGenerated.testAutowiring_inspectionData_Inspections_test - Not a Kotlin issue (presumably IDEA-175971) SpringQuickFixTestGenerated$AddQualifierAnnotation.testAmbiguousBean - Not a Kotlin issue (IDEA-175971)
This commit is contained in:
committed by
Nikolay Krasko
parent
532560ef43
commit
384ae8d8b5
Vendored
+1
@@ -5,6 +5,7 @@ package a
|
||||
import org.springframework.stereotype.Component
|
||||
import org.springframework.context.annotation.Configuration
|
||||
import org.springframework.beans.factory.annotation.Autowired
|
||||
import org.springframework.context.annotation.ComponentScan
|
||||
|
||||
@Component
|
||||
open class FooBean {
|
||||
|
||||
+1
@@ -5,6 +5,7 @@ package a
|
||||
import org.springframework.stereotype.Component
|
||||
import org.springframework.context.annotation.Configuration
|
||||
import org.springframework.beans.factory.annotation.Autowired
|
||||
import org.springframework.context.annotation.ComponentScan
|
||||
|
||||
@Component
|
||||
open class FooBean {
|
||||
|
||||
Vendored
+1
@@ -4,6 +4,7 @@ package a
|
||||
|
||||
import org.springframework.stereotype.Component
|
||||
import org.springframework.context.annotation.Configuration
|
||||
import org.springframework.context.annotation.ComponentScan
|
||||
|
||||
@Component
|
||||
open class FooBean {
|
||||
|
||||
+1
@@ -4,6 +4,7 @@ package a
|
||||
|
||||
import org.springframework.stereotype.Component
|
||||
import org.springframework.context.annotation.Configuration
|
||||
import org.springframework.context.annotation.ComponentScan
|
||||
|
||||
@Component
|
||||
open class FooBean {
|
||||
|
||||
+1
@@ -6,6 +6,7 @@ import org.springframework.beans.factory.annotation.Autowired
|
||||
import org.springframework.beans.factory.annotation.Qualifier
|
||||
import org.springframework.stereotype.Component
|
||||
import org.springframework.context.annotation.Configuration
|
||||
import org.springframework.context.annotation.ComponentScan
|
||||
|
||||
@Component
|
||||
open class FooBean {
|
||||
|
||||
Vendored
+1
-1
@@ -1,5 +1,5 @@
|
||||
// ACTION_CLASS: org.jetbrains.kotlin.idea.spring.generate.GenerateKotlinAutowiredDependencyAction
|
||||
// CONFIG_FILE:
|
||||
// CONFIG_FILE: spring-config.xml
|
||||
// CHOOSE_BEAN: barBean
|
||||
package a
|
||||
|
||||
|
||||
ultimate/testData/spring/core/generate/autowiredDependencies/propertyWithQualifierXmlConfig.kt.after
Vendored
+1
-1
@@ -1,5 +1,5 @@
|
||||
// ACTION_CLASS: org.jetbrains.kotlin.idea.spring.generate.GenerateKotlinAutowiredDependencyAction
|
||||
// CONFIG_FILE:
|
||||
// CONFIG_FILE: spring-config.xml
|
||||
// CHOOSE_BEAN: barBean
|
||||
package a
|
||||
|
||||
|
||||
Vendored
+1
@@ -4,6 +4,7 @@ package a
|
||||
|
||||
import org.springframework.stereotype.Component
|
||||
import org.springframework.context.annotation.Configuration
|
||||
import org.springframework.context.annotation.ComponentScan
|
||||
|
||||
@Component
|
||||
open class FooBean {
|
||||
|
||||
ultimate/testData/spring/core/generate/autowiredDependencies/singlePropertyAnnotationConfig.kt.after
Vendored
+1
@@ -5,6 +5,7 @@ package a
|
||||
import org.springframework.beans.factory.annotation.Autowired
|
||||
import org.springframework.stereotype.Component
|
||||
import org.springframework.context.annotation.Configuration
|
||||
import org.springframework.context.annotation.ComponentScan
|
||||
|
||||
@Component
|
||||
open class FooBean {
|
||||
|
||||
+1
-1
@@ -5,5 +5,5 @@
|
||||
icon: "ShowAutowiredDependencies",
|
||||
tooltip: "Navigate to autowired candidates",
|
||||
naming: "generic",
|
||||
targets: ["myBean(String)", "prop2", "setProp1(String)"]
|
||||
targets: ["autowiredProp", "collab", "prop2"]
|
||||
}
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
springConfig: ["ComponentScan.kt"],
|
||||
file: "ComponentScan.kt",
|
||||
icon: "SpringJavaBean",
|
||||
icon: "SpringScan",
|
||||
tooltip: "Navigate to the spring bean declaration(s)",
|
||||
naming: "bean",
|
||||
targets: ["resourceGutter", "customControllerName"]
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
{
|
||||
withRuntime: "true",
|
||||
springConfig: [],
|
||||
springConfig: ["ContextBeanWithQualifierInjectionPoints.kt"],
|
||||
file: "ContextBeanWithQualifierInjectionPoints.kt",
|
||||
icon: "ShowAutowiredDependencies",
|
||||
tooltip: "Navigate to the autowired dependencies",
|
||||
|
||||
Reference in New Issue
Block a user