Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
2359942d
S
spring-framework
项目概览
爱吃血肠
/
spring-framework
通知
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,体验更适合开发者的 AI 搜索 >>
提交
2359942d
编写于
12月 14, 2008
作者:
C
Chris Beams
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
moving unit tests from .testsuite -> .context
上级
931728ba
变更
15
隐藏空白更改
内联
并排
Showing
15 changed file
with
615 addition
and
52 deletion
+615
-52
org.springframework.context/src/test/java/org/springframework/beans/factory/HasMap.java
...c/test/java/org/springframework/beans/factory/HasMap.java
+94
-0
org.springframework.context/src/test/java/org/springframework/beans/factory/xml/MapAndSet.java
...java/org/springframework/beans/factory/xml/MapAndSet.java
+39
-0
org.springframework.context/src/test/java/org/springframework/beans/factory/xml/MixedCollectionBean.java
...pringframework/beans/factory/xml/MixedCollectionBean.java
+41
-0
org.springframework.context/src/test/java/org/springframework/beans/factory/xml/collections.xml
...ava/org/springframework/beans/factory/xml/collections.xml
+374
-0
org.springframework.context/src/test/java/org/springframework/beans/factory/xml/parent.xml
...est/java/org/springframework/beans/factory/xml/parent.xml
+23
-0
org.springframework.context/src/test/java/org/springframework/context/access/ContextJndiBeanFactoryLocatorTests.java
...rk/context/access/ContextJndiBeanFactoryLocatorTests.java
+0
-0
org.springframework.context/src/test/java/org/springframework/context/annotation/ClassPathBeanDefinitionScannerTests.java
...ntext/annotation/ClassPathBeanDefinitionScannerTests.java
+12
-12
org.springframework.context/src/test/java/org/springframework/context/annotation/DoubleScanTests.java
...g/springframework/context/annotation/DoubleScanTests.java
+2
-1
org.springframework.context/src/test/java/org/springframework/context/annotation/SimpleConfigTests.java
...springframework/context/annotation/SimpleConfigTests.java
+15
-18
org.springframework.context/src/test/java/org/springframework/context/annotation/SimpleScanTests.java
...g/springframework/context/annotation/SimpleScanTests.java
+13
-19
org.springframework.context/src/test/java/org/springframework/context/annotation/doubleScanTests.xml
...rg/springframework/context/annotation/doubleScanTests.xml
+0
-0
org.springframework.context/src/test/java/org/springframework/context/annotation/simpleConfigTests.xml
.../springframework/context/annotation/simpleConfigTests.xml
+2
-2
org.springframework.context/src/test/java/org/springframework/context/annotation/simpleScanTests.xml
...rg/springframework/context/annotation/simpleScanTests.xml
+0
-0
org.springframework.context/src/test/java/org/springframework/context/annotation2/NamedStubDao2.java
...rg/springframework/context/annotation2/NamedStubDao2.java
+0
-0
org.springframework.context/src/test/java/org/springframework/context/annotation3/StubFooDao.java
...a/org/springframework/context/annotation3/StubFooDao.java
+0
-0
未找到文件。
org.springframework.context/src/test/java/org/springframework/beans/factory/HasMap.java
0 → 100644
浏览文件 @
2359942d
/*
* Copyright 2002-2005 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.beans.factory
;
import
java.util.Map
;
import
java.util.Properties
;
import
java.util.Set
;
/**
* Bean exposing a map. Used for bean factory tests.
*
* @author Rod Johnson
* @since 05.06.2003
*/
public
class
HasMap
{
private
Map
map
;
private
Set
set
;
private
Properties
props
;
private
Object
[]
objectArray
;
private
Class
[]
classArray
;
private
Integer
[]
intArray
;
private
HasMap
()
{
}
public
Map
getMap
()
{
return
map
;
}
public
void
setMap
(
Map
map
)
{
this
.
map
=
map
;
}
public
Set
getSet
()
{
return
set
;
}
public
void
setSet
(
Set
set
)
{
this
.
set
=
set
;
}
public
Properties
getProps
()
{
return
props
;
}
public
void
setProps
(
Properties
props
)
{
this
.
props
=
props
;
}
public
Object
[]
getObjectArray
()
{
return
objectArray
;
}
public
void
setObjectArray
(
Object
[]
objectArray
)
{
this
.
objectArray
=
objectArray
;
}
public
Class
[]
getClassArray
()
{
return
classArray
;
}
public
void
setClassArray
(
Class
[]
classArray
)
{
this
.
classArray
=
classArray
;
}
public
Integer
[]
getIntegerArray
()
{
return
intArray
;
}
public
void
setIntegerArray
(
Integer
[]
is
)
{
intArray
=
is
;
}
}
org.springframework.context/src/test/java/org/springframework/beans/factory/xml/MapAndSet.java
0 → 100644
浏览文件 @
2359942d
/*
* Copyright 2002-2006 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.beans.factory.xml
;
import
java.util.Map
;
import
java.util.Set
;
/**
* @author Chris Beams
*/
public
class
MapAndSet
{
private
Object
obj
;
public
MapAndSet
(
Map
map
)
{
this
.
obj
=
map
;
}
public
MapAndSet
(
Set
set
)
{
this
.
obj
=
set
;
}
public
Object
getObject
()
{
return
obj
;
}
}
org.springframework.context/src/test/java/org/springframework/beans/factory/xml/MixedCollectionBean.java
0 → 100644
浏览文件 @
2359942d
/*
* Copyright 2002-2006 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.beans.factory.xml
;
import
java.util.Collection
;
/**
* Bean that exposes a simple property that can be set
* to a mix of references and individual values.
*
* @author Rod Johnson
* @since 27.05.2003
*/
public
class
MixedCollectionBean
{
private
Collection
jumble
;
public
void
setJumble
(
Collection
jumble
)
{
this
.
jumble
=
jumble
;
}
public
Collection
getJumble
()
{
return
jumble
;
}
}
org.springframework.context/src/test/java/org/springframework/beans/factory/xml/collections.xml
0 → 100644
浏览文件 @
2359942d
<?xml version="1.0" encoding="UTF-8"?>
<beans
xmlns=
"http://www.springframework.org/schema/beans"
xmlns:xsi=
"http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation=
"http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd"
>
<bean
id=
"jenny"
class=
"org.springframework.beans.TestBean"
>
<property
name=
"name"
><value>
Jenny
</value></property>
<property
name=
"age"
><value>
30
</value></property>
<property
name=
"spouse"
>
<!-- Could use id and href -->
<ref
local=
"david"
/>
</property>
</bean>
<bean
id=
"david"
class=
"org.springframework.beans.TestBean"
>
<description>
Simple bean, without any collections.
</description>
<property
name=
"name"
>
<description>
The name of the user
</description>
<value>
David
</value>
</property>
<property
name=
"age"
><value>
27
</value></property>
</bean>
<bean
id=
"rod"
class=
"org.springframework.beans.TestBean"
>
<property
name=
"name"
><value>
Rod
</value></property>
<property
name=
"age"
><value>
32
</value></property>
<property
name=
"friends"
>
<description>
List of Rod's friends
</description>
<list>
<ref
local=
"jenny"
/>
<ref
local=
"david"
/>
</list>
</property>
</bean>
<bean
id=
"pJenny"
class=
"org.springframework.beans.TestBean"
scope=
"prototype"
>
<property
name=
"name"
><value>
Jenny
</value></property>
<property
name=
"age"
><value>
30
</value></property>
<property
name=
"spouse"
>
<!-- Could use id and href -->
<ref
local=
"david"
/>
</property>
</bean>
<bean
id=
"pDavid"
class=
"org.springframework.beans.TestBean"
scope=
"prototype"
>
<property
name=
"name"
><value>
David
</value></property>
<property
name=
"age"
><value>
27
</value></property>
</bean>
<bean
id=
"pRod"
class=
"org.springframework.beans.TestBean"
scope=
"prototype"
>
<property
name=
"name"
><value>
Rod
</value></property>
<property
name=
"age"
><value>
32
</value></property>
<property
name=
"friends"
>
<list>
<ref
local=
"pJenny"
/>
<ref
local=
"pDavid"
/>
</list>
</property>
</bean>
<!--
Try setting a collection property to a single value
-->
<bean
id=
"loner"
class=
"org.springframework.beans.TestBean"
>
<property
name=
"name"
><value>
loner
</value></property>
<property
name=
"age"
><value>
26
</value></property>
<property
name=
"friends"
>
<list>
<description>
My List
</description>
<ref
local=
"david"
/>
</list>
</property>
</bean>
<bean
id=
"jumble"
class=
"org.springframework.beans.factory.xml.MixedCollectionBean"
>
<property
name=
"jumble"
>
<list>
<ref
local=
"david"
/>
<value>
literal
</value>
<ref
local=
"jenny"
/>
<idref
local=
"rod"
/>
</list>
</property>
</bean>
<bean
id=
"jumble2"
class=
"org.springframework.beans.factory.xml.MixedCollectionBean"
lazy-init=
"true"
>
<property
name=
"jumble"
>
<list>
<ref
local=
"david"
/>
<value>
literal
</value>
<ref
local=
"jenny"
/>
<idref
bean=
"rod"
/>
<idref
bean=
"rod2"
/>
</list>
</property>
</bean>
<bean
id=
"verbose"
class=
"org.springframework.beans.TestBean"
>
<property
name=
"name"
><value>
verbose
</value></property>
</bean>
<bean
id=
"verbose2"
class=
"org.springframework.beans.TestBean"
>
<property
name=
"name"
><idref
local=
"verbose"
/></property>
</bean>
<bean
id=
"verbose3"
class=
"org.springframework.beans.TestBean"
>
<property
name=
"name"
><idref
bean=
"verbose"
/></property>
</bean>
<bean
id=
"emptyMap"
class=
"org.springframework.beans.factory.HasMap"
>
<property
name=
"map"
>
<map>
</map>
</property>
</bean>
<bean
id=
"literalMap"
class=
"org.springframework.beans.factory.HasMap"
>
<property
name=
"map"
>
<map>
<entry
key=
"foo"
value=
"bar"
/>
<entry
key=
"fi"
value=
"fum"
/>
<entry
key=
"fa"
><null/></entry>
</map>
</property>
</bean>
<bean
id=
"mixedMap"
class=
"org.springframework.beans.factory.HasMap"
>
<property
name=
"map"
>
<map>
<entry
key-ref=
"fooKey"
>
<value
type=
"java.lang.Integer"
>
10
</value>
</entry>
<entry>
<key>
<ref
bean=
"jennyKey"
/>
</key>
<ref
local=
"jenny"
/>
</entry>
<entry>
<key>
<bean
class=
"java.lang.Integer"
>
<constructor-arg
value=
"5"
/>
</bean>
</key>
<idref
bean=
"david"
/>
</entry>
</map>
</property>
</bean>
<bean
id=
"fooKey"
class=
"java.lang.String"
>
<constructor-arg
value=
"foo"
/>
</bean>
<bean
id=
"jennyKey"
class=
"java.lang.String"
>
<constructor-arg
value=
"jenny"
/>
</bean>
<bean
id=
"pMixedMap"
class=
"org.springframework.beans.factory.HasMap"
scope=
"prototype"
>
<property
name=
"map"
>
<map>
<entry
key=
"foo"
value=
"bar"
/>
<entry
key=
"jenny"
value-ref=
"pJenny"
/>
</map>
</property>
</bean>
<bean
id=
"mixedMapWithList"
class=
"org.springframework.beans.factory.HasMap"
>
<property
name=
"map"
>
<map>
<entry>
<key><null/></key>
<value>
bar
</value>
</entry>
<entry
key=
"jenny"
><ref
local=
"jenny"
/></entry>
<entry
key=
"list"
>
<list>
<value>
zero
</value>
<map>
<entry
key=
"fo"
><value>
bar
</value></entry>
<entry
key=
"jen"
><ref
local=
"jenny"
/></entry>
</map>
<list>
<ref
local=
"jenny"
/>
<value>
ba
</value>
</list>
<null/>
</list>
</entry>
<entry
key=
"map"
>
<map>
<entry
key=
"foo"
><value>
bar
</value></entry>
<entry
key=
"jenny"
><ref
local=
"jenny"
/></entry>
</map>
</entry>
</map>
</property>
</bean>
<bean
id=
"emptySet"
class=
"org.springframework.beans.factory.HasMap"
>
<property
name=
"set"
>
<set>
</set>
</property>
</bean>
<bean
id=
"set"
class=
"org.springframework.beans.factory.HasMap"
>
<property
name=
"set"
>
<set>
<value>
bar
</value>
<ref
local=
"jenny"
/>
<null/>
</set>
</property>
</bean>
<bean
id=
"emptyProps"
class=
"org.springframework.beans.factory.HasMap"
>
<property
name=
"props"
>
<props>
</props>
</property>
</bean>
<bean
id=
"props"
class=
"org.springframework.beans.factory.HasMap"
>
<property
name=
"props"
>
<props>
<prop
key=
"foo"
>
bar
</prop>
<prop
key=
"2"
>
TWO
</prop>
</props>
</property>
</bean>
<bean
id=
"propsViaMap"
class=
"org.springframework.beans.factory.HasMap"
>
<property
name=
"props"
>
<map>
<entry
key=
"foo"
value=
"bar"
/>
<entry
key=
"2"
value=
"TWO"
/>
</map>
</property>
</bean>
<bean
id=
"objectArray"
class=
"org.springframework.beans.factory.HasMap"
>
<property
name=
"objectArray"
>
<list>
<value>
one
</value>
<ref
local=
"jenny"
/>
</list>
</property>
</bean>
<bean
id=
"classArray"
class=
"org.springframework.beans.factory.HasMap"
>
<property
name=
"classArray"
>
<list>
<value>
java.lang.String
</value>
<value>
java.lang.Exception
</value>
</list>
</property>
</bean>
<bean
id=
"integerArray"
class=
"org.springframework.beans.factory.HasMap"
>
<property
name=
"integerArray"
>
<list>
<value>
0
</value>
<value>
1
</value>
<value>
2
</value>
</list>
</property>
</bean>
<bean
id=
"listFactory"
class=
"org.springframework.beans.factory.config.ListFactoryBean"
>
<property
name=
"sourceList"
>
<list>
<value>
bar
</value>
<value>
jenny
</value>
</list>
</property>
<property
name=
"targetListClass"
>
<value>
java.util.LinkedList
</value>
</property>
</bean>
<bean
id=
"pListFactory"
class=
"org.springframework.beans.factory.config.ListFactoryBean"
>
<property
name=
"sourceList"
>
<list>
<value>
bar
</value>
<value>
jenny
</value>
</list>
</property>
<property
name=
"targetListClass"
>
<value>
java.util.LinkedList
</value>
</property>
<property
name=
"singleton"
>
<value>
true
</value>
</property>
</bean>
<bean
id=
"setFactory"
class=
"org.springframework.beans.factory.config.SetFactoryBean"
>
<property
name=
"sourceSet"
>
<set>
<value>
bar
</value>
<value>
jenny
</value>
</set>
</property>
<property
name=
"targetSetClass"
>
<value>
java.util.TreeSet
</value>
</property>
</bean>
<bean
id=
"pSetFactory"
class=
"org.springframework.beans.factory.config.SetFactoryBean"
>
<property
name=
"sourceSet"
>
<set>
<value>
bar
</value>
<value>
jenny
</value>
</set>
</property>
<property
name=
"targetSetClass"
>
<value>
java.util.TreeSet
</value>
</property>
<property
name=
"singleton"
>
<value>
true
</value>
</property>
</bean>
<bean
id=
"mapFactory"
class=
"org.springframework.beans.factory.config.MapFactoryBean"
>
<property
name=
"sourceMap"
>
<map>
<entry
key=
"foo"
><value>
bar
</value></entry>
<entry
key=
"jen"
><value>
jenny
</value></entry>
</map>
</property>
<property
name=
"targetMapClass"
>
<value>
java.util.TreeMap
</value>
</property>
</bean>
<bean
id=
"pMapFactory"
class=
"org.springframework.beans.factory.config.MapFactoryBean"
>
<property
name=
"sourceMap"
>
<map>
<entry
key=
"foo"
><value>
bar
</value></entry>
<entry
key=
"jen"
><value>
jenny
</value></entry>
</map>
</property>
<property
name=
"targetMapClass"
>
<value>
java.util.TreeMap
</value>
</property>
<property
name=
"singleton"
>
<value>
true
</value>
</property>
</bean>
<bean
id=
"setAndMap"
class=
"org.springframework.beans.factory.xml.MapAndSet"
>
<constructor-arg>
<map>
<description>
My Map
</description>
<entry
key=
"key1"
value=
"val1"
/>
<entry
key=
"key2"
value=
"val2"
/>
<entry
key=
"key3"
value=
"val3"
/>
</map>
</constructor-arg>
</bean>
<bean
id=
"enumSetFactory"
class=
"org.springframework.beans.factory.config.SetFactoryBean"
>
<property
name=
"sourceSet"
>
<set>
<description>
My Set
</description>
</set>
</property>
</bean>
</beans>
org.springframework.context/src/test/java/org/springframework/beans/factory/xml/parent.xml
0 → 100644
浏览文件 @
2359942d
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
<beans>
<bean
id=
"inheritedTestBean"
class=
"org.springframework.beans.TestBean"
abstract=
"true"
>
<property
name=
"name"
><value>
parent
</value></property>
<property
name=
"age"
><value>
1
</value></property>
</bean>
<bean
id=
"inheritedTestBeanWithoutClass"
abstract=
"true"
>
<property
name=
"name"
><value>
parent
</value></property>
<property
name=
"age"
><value>
1
</value></property>
</bean>
<bean
id=
"inheritedTestBeanPrototype"
class=
"org.springframework.beans.TestBean"
scope=
"prototype"
>
<property
name=
"name"
><value>
parent
</value></property>
<property
name=
"age"
><value>
2
</value></property>
</bean>
<bean
id=
"inheritedTestBeanSingleton"
class=
"org.springframework.beans.TestBean"
/>
</beans>
org.springframework.
testsuite
/src/test/java/org/springframework/context/access/ContextJndiBeanFactoryLocatorTests.java
→
org.springframework.
context
/src/test/java/org/springframework/context/access/ContextJndiBeanFactoryLocatorTests.java
浏览文件 @
2359942d
文件已移动
org.springframework.
testsuite
/src/test/java/org/springframework/context/annotation/ClassPathBeanDefinitionScannerTests.java
→
org.springframework.
context
/src/test/java/org/springframework/context/annotation/ClassPathBeanDefinitionScannerTests.java
浏览文件 @
2359942d
...
...
@@ -56,7 +56,7 @@ public class ClassPathBeanDefinitionScannerTests {
GenericApplicationContext
context
=
new
GenericApplicationContext
();
ClassPathBeanDefinitionScanner
scanner
=
new
ClassPathBeanDefinitionScanner
(
context
);
int
beanCount
=
scanner
.
scan
(
BASE_PACKAGE
);
assertEquals
(
10
,
beanCount
);
assertEquals
(
9
,
beanCount
);
assertTrue
(
context
.
containsBean
(
"serviceInvocationCounter"
));
assertTrue
(
context
.
containsBean
(
"fooServiceImpl"
));
assertTrue
(
context
.
containsBean
(
"stubFooDao"
));
...
...
@@ -73,7 +73,7 @@ public class ClassPathBeanDefinitionScannerTests {
GenericApplicationContext
context
=
new
GenericApplicationContext
();
ClassPathBeanDefinitionScanner
scanner
=
new
ClassPathBeanDefinitionScanner
(
context
);
int
beanCount
=
scanner
.
scan
(
BASE_PACKAGE
);
assertEquals
(
10
,
beanCount
);
assertEquals
(
9
,
beanCount
);
scanner
.
scan
(
BASE_PACKAGE
);
assertTrue
(
context
.
containsBean
(
"serviceInvocationCounter"
));
assertTrue
(
context
.
containsBean
(
"fooServiceImpl"
));
...
...
@@ -191,7 +191,7 @@ public class ClassPathBeanDefinitionScannerTests {
ClassPathBeanDefinitionScanner
scanner
=
new
ClassPathBeanDefinitionScanner
(
context
,
false
);
scanner
.
addIncludeFilter
(
new
AnnotationTypeFilter
(
CustomComponent
.
class
));
int
beanCount
=
scanner
.
scan
(
BASE_PACKAGE
);
assertEquals
(
5
,
beanCount
);
assertEquals
(
4
,
beanCount
);
assertTrue
(
context
.
containsBean
(
"messageBean"
));
assertTrue
(
context
.
containsBean
(
AnnotationConfigUtils
.
AUTOWIRED_ANNOTATION_PROCESSOR_BEAN_NAME
));
assertTrue
(
context
.
containsBean
(
AnnotationConfigUtils
.
COMMON_ANNOTATION_PROCESSOR_BEAN_NAME
));
...
...
@@ -204,7 +204,7 @@ public class ClassPathBeanDefinitionScannerTests {
ClassPathBeanDefinitionScanner
scanner
=
new
ClassPathBeanDefinitionScanner
(
context
,
false
);
scanner
.
addIncludeFilter
(
new
AnnotationTypeFilter
(
CustomComponent
.
class
));
int
beanCount
=
scanner
.
scan
(
BASE_PACKAGE
);
assertEquals
(
5
,
beanCount
);
assertEquals
(
4
,
beanCount
);
assertTrue
(
context
.
containsBean
(
"messageBean"
));
assertFalse
(
context
.
containsBean
(
"serviceInvocationCounter"
));
assertFalse
(
context
.
containsBean
(
"fooServiceImpl"
));
...
...
@@ -222,7 +222,7 @@ public class ClassPathBeanDefinitionScannerTests {
ClassPathBeanDefinitionScanner
scanner
=
new
ClassPathBeanDefinitionScanner
(
context
,
true
);
scanner
.
addIncludeFilter
(
new
AnnotationTypeFilter
(
CustomComponent
.
class
));
int
beanCount
=
scanner
.
scan
(
BASE_PACKAGE
);
assertEquals
(
1
1
,
beanCount
);
assertEquals
(
1
0
,
beanCount
);
assertTrue
(
context
.
containsBean
(
"messageBean"
));
assertTrue
(
context
.
containsBean
(
"serviceInvocationCounter"
));
assertTrue
(
context
.
containsBean
(
"fooServiceImpl"
));
...
...
@@ -240,7 +240,7 @@ public class ClassPathBeanDefinitionScannerTests {
ClassPathBeanDefinitionScanner
scanner
=
new
ClassPathBeanDefinitionScanner
(
context
,
true
);
scanner
.
addExcludeFilter
(
new
AnnotationTypeFilter
(
Aspect
.
class
));
int
beanCount
=
scanner
.
scan
(
BASE_PACKAGE
);
assertEquals
(
9
,
beanCount
);
assertEquals
(
8
,
beanCount
);
assertFalse
(
context
.
containsBean
(
"serviceInvocationCounter"
));
assertTrue
(
context
.
containsBean
(
"fooServiceImpl"
));
assertTrue
(
context
.
containsBean
(
"stubFooDao"
));
...
...
@@ -257,7 +257,7 @@ public class ClassPathBeanDefinitionScannerTests {
ClassPathBeanDefinitionScanner
scanner
=
new
ClassPathBeanDefinitionScanner
(
context
,
true
);
scanner
.
addExcludeFilter
(
new
AssignableTypeFilter
(
FooService
.
class
));
int
beanCount
=
scanner
.
scan
(
BASE_PACKAGE
);
assertEquals
(
9
,
beanCount
);
assertEquals
(
8
,
beanCount
);
assertFalse
(
context
.
containsBean
(
"fooServiceImpl"
));
assertTrue
(
context
.
containsBean
(
"serviceInvocationCounter"
));
assertTrue
(
context
.
containsBean
(
"stubFooDao"
));
...
...
@@ -293,7 +293,7 @@ public class ClassPathBeanDefinitionScannerTests {
scanner
.
addExcludeFilter
(
new
AssignableTypeFilter
(
FooService
.
class
));
scanner
.
addExcludeFilter
(
new
AnnotationTypeFilter
(
Aspect
.
class
));
int
beanCount
=
scanner
.
scan
(
BASE_PACKAGE
);
assertEquals
(
8
,
beanCount
);
assertEquals
(
7
,
beanCount
);
assertFalse
(
context
.
containsBean
(
"fooServiceImpl"
));
assertFalse
(
context
.
containsBean
(
"serviceInvocationCounter"
));
assertTrue
(
context
.
containsBean
(
"stubFooDao"
));
...
...
@@ -310,7 +310,7 @@ public class ClassPathBeanDefinitionScannerTests {
ClassPathBeanDefinitionScanner
scanner
=
new
ClassPathBeanDefinitionScanner
(
context
);
scanner
.
setBeanNameGenerator
(
new
TestBeanNameGenerator
());
int
beanCount
=
scanner
.
scan
(
BASE_PACKAGE
);
assertEquals
(
10
,
beanCount
);
assertEquals
(
9
,
beanCount
);
assertFalse
(
context
.
containsBean
(
"fooServiceImpl"
));
assertTrue
(
context
.
containsBean
(
"fooService"
));
assertTrue
(
context
.
containsBean
(
"serviceInvocationCounter"
));
...
...
@@ -329,7 +329,7 @@ public class ClassPathBeanDefinitionScannerTests {
GenericApplicationContext
multiPackageContext
=
new
GenericApplicationContext
();
ClassPathBeanDefinitionScanner
multiPackageScanner
=
new
ClassPathBeanDefinitionScanner
(
multiPackageContext
);
int
singlePackageBeanCount
=
singlePackageScanner
.
scan
(
BASE_PACKAGE
);
assertEquals
(
10
,
singlePackageBeanCount
);
assertEquals
(
9
,
singlePackageBeanCount
);
multiPackageScanner
.
scan
(
BASE_PACKAGE
,
"org.springframework.dao.annotation"
);
// assertTrue(multiPackageBeanCount > singlePackageBeanCount);
}
...
...
@@ -339,7 +339,7 @@ public class ClassPathBeanDefinitionScannerTests {
GenericApplicationContext
context
=
new
GenericApplicationContext
();
ClassPathBeanDefinitionScanner
scanner
=
new
ClassPathBeanDefinitionScanner
(
context
);
int
beanCount
=
scanner
.
scan
(
BASE_PACKAGE
);
assertEquals
(
10
,
beanCount
);
assertEquals
(
9
,
beanCount
);
assertEquals
(
beanCount
,
context
.
getBeanDefinitionCount
());
int
addedBeanCount
=
scanner
.
scan
(
"org.springframework.aop.aspectj.annotation"
);
assertEquals
(
beanCount
+
addedBeanCount
,
context
.
getBeanDefinitionCount
());
...
...
@@ -352,7 +352,7 @@ public class ClassPathBeanDefinitionScannerTests {
ClassPathBeanDefinitionScanner
scanner
=
new
ClassPathBeanDefinitionScanner
(
context
);
scanner
.
setBeanNameGenerator
(
new
TestBeanNameGenerator
());
int
beanCount
=
scanner
.
scan
(
BASE_PACKAGE
);
assertEquals
(
10
,
beanCount
);
assertEquals
(
9
,
beanCount
);
context
.
refresh
();
FooServiceImpl
fooService
=
(
FooServiceImpl
)
context
.
getBean
(
"fooService"
);
...
...
org.springframework.
testsuite
/src/test/java/org/springframework/context/annotation/DoubleScanTests.java
→
org.springframework.
context
/src/test/java/org/springframework/context/annotation/DoubleScanTests.java
浏览文件 @
2359942d
...
...
@@ -18,12 +18,13 @@ package org.springframework.context.annotation;
/**
* @author Juergen Hoeller
* @author Chris Beams
*/
public
class
DoubleScanTests
extends
SimpleScanTests
{
@Override
protected
String
[]
getConfigLocations
()
{
return
new
String
[]
{
"
org/springframework/context/annotation/
doubleScanTests.xml"
};
return
new
String
[]
{
"doubleScanTests.xml"
};
}
}
\ No newline at end of file
org.springframework.
testsuite
/src/test/java/org/springframework/context/annotation/SimpleConfigTests.java
→
org.springframework.
context
/src/test/java/org/springframework/context/annotation/SimpleConfigTests.java
浏览文件 @
2359942d
...
...
@@ -16,7 +16,10 @@
package
org.springframework.context.annotation
;
import
org.springframework.test.AbstractDependencyInjectionSpringContextTests
;
import
static
org
.
junit
.
Assert
.
assertEquals
;
import
org.junit.Test
;
import
org.springframework.context.support.ClassPathXmlApplicationContext
;
import
example.scannable.FooService
;
import
example.scannable.ServiceInvocationCounter
;
...
...
@@ -24,21 +27,15 @@ import example.scannable.ServiceInvocationCounter;
/**
* @author Mark Fisher
*/
public
class
SimpleConfigTests
extends
AbstractDependencyInjectionSpringContextTests
{
private
FooService
fooService
;
private
ServiceInvocationCounter
serviceInvocationCounter
;
public
class
SimpleConfigTests
{
public
void
setFooService
(
FooService
fooService
)
{
this
.
fooService
=
fooService
;
}
public
void
setServiceInvocationCounter
(
ServiceInvocationCounter
serviceInvocationCounter
)
{
this
.
serviceInvocationCounter
=
serviceInvocationCounter
;
}
@Test
public
void
testFooService
()
throws
Exception
{
ClassPathXmlApplicationContext
ctx
=
new
ClassPathXmlApplicationContext
(
getConfigLocations
(),
getClass
());
FooService
fooService
=
(
FooService
)
ctx
.
getBean
(
"fooServiceImpl"
);
ServiceInvocationCounter
serviceInvocationCounter
=
(
ServiceInvocationCounter
)
ctx
.
getBean
(
"serviceInvocationCounter"
);
String
value
=
fooService
.
foo
(
1
);
assertEquals
(
"bar"
,
value
);
...
...
@@ -47,10 +44,10 @@ public class SimpleConfigTests extends AbstractDependencyInjectionSpringContextT
fooService
.
foo
(
1
);
assertEquals
(
2
,
serviceInvocationCounter
.
getCount
());
}
@Override
protected
String
[]
getConfigLocations
()
{
return
new
String
[]
{
"org/springframework/context/annotation/simpleConfigTests.xml"
};
public
String
[]
getConfigLocations
()
{
return
new
String
[]
{
"simpleConfigTests.xml"
};
}
}
org.springframework.
testsuite
/src/test/java/org/springframework/context/annotation/SimpleScanTests.java
→
org.springframework.
context
/src/test/java/org/springframework/context/annotation/SimpleScanTests.java
浏览文件 @
2359942d
...
...
@@ -16,7 +16,10 @@
package
org.springframework.context.annotation
;
import
org.springframework.test.AbstractDependencyInjectionSpringContextTests
;
import
static
org
.
junit
.
Assert
.*;
import
org.junit.Test
;
import
org.springframework.context.support.ClassPathXmlApplicationContext
;
import
example.scannable.FooService
;
import
example.scannable.ServiceInvocationCounter
;
...
...
@@ -24,30 +27,21 @@ import example.scannable.ServiceInvocationCounter;
/**
* @author Mark Fisher
* @author Juergen Hoeller
* @author Chris Beams
*/
public
class
SimpleScanTests
extends
AbstractDependencyInjectionSpringContextTests
{
private
FooService
fooService
;
private
ServiceInvocationCounter
serviceInvocationCounter
;
public
void
setFooService
(
FooService
fooService
)
{
this
.
fooService
=
fooService
;
}
public
class
SimpleScanTests
{
public
void
setServiceInvocationCounter
(
ServiceInvocationCounter
serviceInvocationCounter
)
{
this
.
serviceInvocationCounter
=
serviceInvocationCounter
;
}
@Override
protected
String
[]
getConfigLocations
()
{
return
new
String
[]
{
"
org/springframework/context/annotation/
simpleScanTests.xml"
};
return
new
String
[]
{
"simpleScanTests.xml"
};
}
@Test
public
void
testFooService
()
throws
Exception
{
ClassPathXmlApplicationContext
ctx
=
new
ClassPathXmlApplicationContext
(
getConfigLocations
(),
getClass
());
FooService
fooService
=
(
FooService
)
ctx
.
getBean
(
"fooServiceImpl"
);
ServiceInvocationCounter
serviceInvocationCounter
=
(
ServiceInvocationCounter
)
ctx
.
getBean
(
"serviceInvocationCounter"
);
assertEquals
(
0
,
serviceInvocationCounter
.
getCount
());
assertTrue
(
fooService
.
isInitCalled
());
...
...
org.springframework.
testsuite
/src/test/java/org/springframework/context/annotation/doubleScanTests.xml
→
org.springframework.
context
/src/test/java/org/springframework/context/annotation/doubleScanTests.xml
浏览文件 @
2359942d
文件已移动
org.springframework.
testsuite
/src/test/java/org/springframework/context/annotation/simpleConfigTests.xml
→
org.springframework.
context
/src/test/java/org/springframework/context/annotation/simpleConfigTests.xml
浏览文件 @
2359942d
...
...
@@ -11,9 +11,9 @@
<aop:aspectj-autoproxy/>
<bean
class=
"example.scannable.FooServiceImpl"
/>
<bean
id=
"fooServiceImpl"
class=
"example.scannable.FooServiceImpl"
/>
<bean
class=
"example.scannable.ServiceInvocationCounter"
/>
<bean
id=
"serviceInvocationCounter"
class=
"example.scannable.ServiceInvocationCounter"
/>
<bean
class=
"example.scannable.StubFooDao"
/>
...
...
org.springframework.
testsuite
/src/test/java/org/springframework/context/annotation/simpleScanTests.xml
→
org.springframework.
context
/src/test/java/org/springframework/context/annotation/simpleScanTests.xml
浏览文件 @
2359942d
文件已移动
org.springframework.
testsuite
/src/test/java/org/springframework/context/annotation2/NamedStubDao2.java
→
org.springframework.
context
/src/test/java/org/springframework/context/annotation2/NamedStubDao2.java
浏览文件 @
2359942d
文件已移动
org.springframework.
testsuite
/src/test/java/org/springframework/context/annotation3/StubFooDao.java
→
org.springframework.
context
/src/test/java/org/springframework/context/annotation3/StubFooDao.java
浏览文件 @
2359942d
文件已移动
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录