Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
dk131072
spring-framework
提交
8cb5c365
S
spring-framework
项目概览
dk131072
/
spring-framework
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
spring-framework
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
8cb5c365
编写于
6月 17, 2011
作者:
C
Chris Beams
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Consolidate tests related to @Config inheritance
Issue: SPR-8183
上级
96b0752d
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
34 addition
and
64 deletion
+34
-64
org.springframework.context/src/test/java/org/springframework/context/annotation/BeanMethodPolymorphismTests.java
...ework/context/annotation/BeanMethodPolymorphismTests.java
+34
-1
org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/PolymorphicConfigurationTests.java
...notation/configuration/PolymorphicConfigurationTests.java
+0
-63
未找到文件。
org.springframework.context/src/test/java/org/springframework/context/annotation/BeanMethodPolymorphismTests.java
浏览文件 @
8cb5c365
...
...
@@ -5,8 +5,12 @@ import static org.junit.Assert.assertThat;
import
static
org
.
junit
.
Assert
.
assertTrue
;
import
static
org
.
junit
.
Assert
.
fail
;
import
java.lang.annotation.Inherited
;
import
org.junit.Test
;
import
org.springframework.beans.factory.parsing.BeanDefinitionParsingException
;
import
org.springframework.beans.factory.support.DefaultListableBeanFactory
;
import
org.springframework.beans.factory.support.RootBeanDefinition
;
/**
* Tests regarding overloading and overriding of bean methods.
...
...
@@ -52,7 +56,7 @@ public class BeanMethodPolymorphismTests {
@Bean
Integer
anInt
()
{
return
5
;
}
@Bean
String
aString
(
Integer
dependency
)
{
return
"overloaded"
+
dependency
;
}
}
/**
* When inheritance is not involved, it is still possible to override a bean method from
* the container's point of view. This is not strictly 'overloading' of a method per se,
...
...
@@ -68,4 +72,33 @@ public class BeanMethodPolymorphismTests {
@Bean
String
aString
()
{
return
"shadow"
;
}
}
/**
* Tests that polymorphic Configuration classes need not explicitly redeclare the
* {@link Configuration} annotation. This respects the {@link Inherited} nature
* of the Configuration annotation, even though it's being detected via ASM.
*/
@Test
public
void
beanMethodsDetectedOnSuperClass
()
{
DefaultListableBeanFactory
beanFactory
=
new
DefaultListableBeanFactory
();
beanFactory
.
registerBeanDefinition
(
"config"
,
new
RootBeanDefinition
(
Config
.
class
));
ConfigurationClassPostProcessor
pp
=
new
ConfigurationClassPostProcessor
();
pp
.
postProcessBeanFactory
(
beanFactory
);
beanFactory
.
getBean
(
"testBean"
,
TestBean
.
class
);
}
@Configuration
static
class
BaseConfig
{
@Bean
public
TestBean
testBean
()
{
return
new
TestBean
();
}
}
@Configuration
static
class
Config
extends
BaseConfig
{
}
}
org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/PolymorphicConfigurationTests.java
已删除
100644 → 0
浏览文件 @
96b0752d
/*
* Copyright 2002-2009 the original author or authors.
*
* 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.springframework.context.annotation.configuration
;
import
java.lang.annotation.Inherited
;
import
org.junit.Test
;
import
test.beans.TestBean
;
import
org.springframework.beans.factory.support.DefaultListableBeanFactory
;
import
org.springframework.beans.factory.support.RootBeanDefinition
;
import
org.springframework.context.annotation.Bean
;
import
org.springframework.context.annotation.Configuration
;
import
org.springframework.context.annotation.ConfigurationClassPostProcessor
;
/**
* Tests that polymorphic Configuration classes need not explicitly redeclare the
* {@link Configuration} annotation. This respects the {@link Inherited} nature
* of the Configuration annotation, even though it's being detected via ASM.
*
* @author Chris Beams
*/
public
class
PolymorphicConfigurationTests
{
@Test
public
void
beanMethodsDetectedOnSuperClass
()
{
DefaultListableBeanFactory
beanFactory
=
new
DefaultListableBeanFactory
();
beanFactory
.
registerBeanDefinition
(
"config"
,
new
RootBeanDefinition
(
Config
.
class
));
ConfigurationClassPostProcessor
pp
=
new
ConfigurationClassPostProcessor
();
pp
.
postProcessBeanFactory
(
beanFactory
);
beanFactory
.
getBean
(
"testBean"
,
TestBean
.
class
);
}
@Configuration
static
class
SuperConfig
{
@Bean
public
TestBean
testBean
()
{
return
new
TestBean
();
}
}
@Configuration
static
class
Config
extends
SuperConfig
{
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录