1
1
/*
2
- * Copyright 2002-2008 the original author or authors.
2
+ * Copyright 2002-2012 the original author or authors.
3
3
*
4
4
* Licensed under the Apache License, Version 2.0 (the "License");
5
5
* you may not use this file except in compliance with the License.
16
16
17
17
package org .springframework .context .annotation ;
18
18
19
- import static org .easymock .EasyMock .*;
20
- import static org .junit .Assert .*;
21
-
19
+ import example .scannable .DefaultNamedComponent ;
22
20
import org .junit .Test ;
21
+
23
22
import org .springframework .beans .factory .annotation .AnnotatedBeanDefinition ;
24
23
import org .springframework .beans .factory .annotation .AnnotatedGenericBeanDefinition ;
25
24
import org .springframework .beans .factory .support .BeanDefinitionRegistry ;
25
+ import org .springframework .beans .factory .support .SimpleBeanDefinitionRegistry ;
26
26
import org .springframework .stereotype .Component ;
27
27
import org .springframework .util .StringUtils ;
28
28
29
- import example . scannable . DefaultNamedComponent ;
29
+ import static org . junit . Assert .* ;
30
30
31
31
/**
32
32
* @author Rick Evans
@@ -41,64 +41,44 @@ public class AnnotationBeanNameGeneratorTests {
41
41
42
42
@ Test
43
43
public void testGenerateBeanNameWithNamedComponent () {
44
- BeanDefinitionRegistry registry = createMock (BeanDefinitionRegistry .class );
45
- replay (registry );
46
-
44
+ BeanDefinitionRegistry registry = new SimpleBeanDefinitionRegistry ();
47
45
AnnotatedBeanDefinition bd = new AnnotatedGenericBeanDefinition (ComponentWithName .class );
48
46
String beanName = this .beanNameGenerator .generateBeanName (bd , registry );
49
47
assertNotNull ("The generated beanName must *never* be null." , beanName );
50
48
assertTrue ("The generated beanName must *never* be blank." , StringUtils .hasText (beanName ));
51
49
assertEquals ("walden" , beanName );
52
-
53
- verify (registry );
54
50
}
55
51
56
52
@ Test
57
53
public void testGenerateBeanNameWithDefaultNamedComponent () {
58
- BeanDefinitionRegistry registry = createMock (BeanDefinitionRegistry .class );
59
- replay (registry );
60
-
54
+ BeanDefinitionRegistry registry = new SimpleBeanDefinitionRegistry ();
61
55
AnnotatedBeanDefinition bd = new AnnotatedGenericBeanDefinition (DefaultNamedComponent .class );
62
56
String beanName = this .beanNameGenerator .generateBeanName (bd , registry );
63
57
assertNotNull ("The generated beanName must *never* be null." , beanName );
64
58
assertTrue ("The generated beanName must *never* be blank." , StringUtils .hasText (beanName ));
65
59
assertEquals ("thoreau" , beanName );
66
-
67
- verify (registry );
68
60
}
69
61
70
62
@ Test
71
63
public void testGenerateBeanNameWithNamedComponentWhereTheNameIsBlank () {
72
- BeanDefinitionRegistry registry = createMock (BeanDefinitionRegistry .class );
73
- replay (registry );
74
-
64
+ BeanDefinitionRegistry registry = new SimpleBeanDefinitionRegistry ();
75
65
AnnotatedBeanDefinition bd = new AnnotatedGenericBeanDefinition (ComponentWithBlankName .class );
76
66
String beanName = this .beanNameGenerator .generateBeanName (bd , registry );
77
67
assertNotNull ("The generated beanName must *never* be null." , beanName );
78
68
assertTrue ("The generated beanName must *never* be blank." , StringUtils .hasText (beanName ));
79
-
80
69
String expectedGeneratedBeanName = this .beanNameGenerator .buildDefaultBeanName (bd );
81
-
82
70
assertEquals (expectedGeneratedBeanName , beanName );
83
-
84
- verify (registry );
85
71
}
86
72
87
73
@ Test
88
74
public void testGenerateBeanNameWithAnonymousComponentYieldsGeneratedBeanName () {
89
- BeanDefinitionRegistry registry = createMock (BeanDefinitionRegistry .class );
90
- replay (registry );
91
-
75
+ BeanDefinitionRegistry registry = new SimpleBeanDefinitionRegistry ();
92
76
AnnotatedBeanDefinition bd = new AnnotatedGenericBeanDefinition (AnonymousComponent .class );
93
77
String beanName = this .beanNameGenerator .generateBeanName (bd , registry );
94
78
assertNotNull ("The generated beanName must *never* be null." , beanName );
95
79
assertTrue ("The generated beanName must *never* be blank." , StringUtils .hasText (beanName ));
96
-
97
80
String expectedGeneratedBeanName = this .beanNameGenerator .buildDefaultBeanName (bd );
98
-
99
81
assertEquals (expectedGeneratedBeanName , beanName );
100
-
101
- verify (registry );
102
82
}
103
83
104
84
0 commit comments