Skip to content

Commit 9511d29

Browse files
jhoellerjhoeller
committed
Updated bean count expectations in ClassPathBeanDefinitionScannerTests
Issue: SPR-16152
1 parent af2e296 commit 9511d29

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

‎spring-context/src/test/java/org/springframework/context/annotation/ClassPathBeanDefinitionScannerTests.java‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public void testSimpleScanWithDefaultFiltersAndPostProcessors() {
5656
GenericApplicationContext context = new GenericApplicationContext();
5757
ClassPathBeanDefinitionScanner scanner = new ClassPathBeanDefinitionScanner(context);
5858
int beanCount = scanner.scan(BASE_PACKAGE);
59-
assertEquals(12, beanCount);
59+
assertEquals(13, beanCount);
6060
assertTrue(context.containsBean("serviceInvocationCounter"));
6161
assertTrue(context.containsBean("fooServiceImpl"));
6262
assertTrue(context.containsBean("stubFooDao"));
@@ -105,7 +105,7 @@ public void testDoubleScan() {
105105
GenericApplicationContext context = new GenericApplicationContext();
106106
ClassPathBeanDefinitionScanner scanner = new ClassPathBeanDefinitionScanner(context);
107107
int beanCount = scanner.scan(BASE_PACKAGE);
108-
assertEquals(12, beanCount);
108+
assertEquals(13, beanCount);
109109
scanner.scan(BASE_PACKAGE);
110110

111111
assertTrue(context.containsBean("serviceInvocationCounter"));
@@ -122,7 +122,7 @@ public void testSimpleScanWithDefaultFiltersAndNoPostProcessors() {
122122
ClassPathBeanDefinitionScanner scanner = new ClassPathBeanDefinitionScanner(context);
123123
scanner.setIncludeAnnotationConfig(false);
124124
int beanCount = scanner.scan(BASE_PACKAGE);
125-
assertEquals(6, beanCount);
125+
assertEquals(7, beanCount);
126126

127127
assertTrue(context.containsBean("serviceInvocationCounter"));
128128
assertTrue(context.containsBean("fooServiceImpl"));
@@ -167,7 +167,7 @@ public void testSimpleScanWithDefaultFiltersAndOverriddenEqualNamedBean() {
167167
scanner.setIncludeAnnotationConfig(false);
168168
int scannedBeanCount = scanner.scan(BASE_PACKAGE);
169169

170-
assertEquals(5, scannedBeanCount);
170+
assertEquals(6, scannedBeanCount);
171171
assertEquals(initialBeanCount + scannedBeanCount, context.getBeanDefinitionCount());
172172
assertTrue(context.containsBean("serviceInvocationCounter"));
173173
assertTrue(context.containsBean("fooServiceImpl"));
@@ -187,7 +187,7 @@ public void testSimpleScanWithDefaultFiltersAndOverriddenCompatibleNamedBean() {
187187
scanner.setIncludeAnnotationConfig(false);
188188
int scannedBeanCount = scanner.scan(BASE_PACKAGE);
189189

190-
assertEquals(5, scannedBeanCount);
190+
assertEquals(6, scannedBeanCount);
191191
assertEquals(initialBeanCount + scannedBeanCount, context.getBeanDefinitionCount());
192192
assertTrue(context.containsBean("serviceInvocationCounter"));
193193
assertTrue(context.containsBean("fooServiceImpl"));
@@ -267,7 +267,7 @@ public void testCustomIncludeFilterAndDefaults() {
267267
scanner.addIncludeFilter(new AnnotationTypeFilter(CustomComponent.class));
268268
int beanCount = scanner.scan(BASE_PACKAGE);
269269

270-
assertEquals(13, beanCount);
270+
assertEquals(14, beanCount);
271271
assertTrue(context.containsBean("messageBean"));
272272
assertTrue(context.containsBean("serviceInvocationCounter"));
273273
assertTrue(context.containsBean("fooServiceImpl"));
@@ -288,7 +288,7 @@ public void testCustomAnnotationExcludeFilterAndDefaults() {
288288
scanner.addExcludeFilter(new AnnotationTypeFilter(Aspect.class));
289289
int beanCount = scanner.scan(BASE_PACKAGE);
290290

291-
assertEquals(11, beanCount);
291+
assertEquals(12, beanCount);
292292
assertFalse(context.containsBean("serviceInvocationCounter"));
293293
assertTrue(context.containsBean("fooServiceImpl"));
294294
assertTrue(context.containsBean("stubFooDao"));
@@ -307,7 +307,7 @@ public void testCustomAssignableTypeExcludeFilterAndDefaults() {
307307
scanner.addExcludeFilter(new AssignableTypeFilter(FooService.class));
308308
int beanCount = scanner.scan(BASE_PACKAGE);
309309

310-
assertEquals(11, beanCount);
310+
assertEquals(12, beanCount);
311311
assertFalse(context.containsBean("fooServiceImpl"));
312312
assertTrue(context.containsBean("serviceInvocationCounter"));
313313
assertTrue(context.containsBean("stubFooDao"));
@@ -328,7 +328,7 @@ public void testCustomAssignableTypeExcludeFilterAndDefaultsWithoutPostProcessor
328328
scanner.addExcludeFilter(new AssignableTypeFilter(FooService.class));
329329
int beanCount = scanner.scan(BASE_PACKAGE);
330330

331-
assertEquals(5, beanCount);
331+
assertEquals(6, beanCount);
332332
assertFalse(context.containsBean("fooServiceImpl"));
333333
assertTrue(context.containsBean("serviceInvocationCounter"));
334334
assertTrue(context.containsBean("stubFooDao"));
@@ -347,7 +347,7 @@ public void testMultipleCustomExcludeFiltersAndDefaults() {
347347
scanner.addExcludeFilter(new AnnotationTypeFilter(Aspect.class));
348348
int beanCount = scanner.scan(BASE_PACKAGE);
349349

350-
assertEquals(10, beanCount);
350+
assertEquals(11, beanCount);
351351
assertFalse(context.containsBean("fooServiceImpl"));
352352
assertFalse(context.containsBean("serviceInvocationCounter"));
353353
assertTrue(context.containsBean("stubFooDao"));
@@ -367,7 +367,7 @@ public void testCustomBeanNameGenerator() {
367367
scanner.setBeanNameGenerator(new TestBeanNameGenerator());
368368
int beanCount = scanner.scan(BASE_PACKAGE);
369369

370-
assertEquals(12, beanCount);
370+
assertEquals(13, beanCount);
371371
assertFalse(context.containsBean("fooServiceImpl"));
372372
assertTrue(context.containsBean("fooService"));
373373
assertTrue(context.containsBean("serviceInvocationCounter"));
@@ -388,7 +388,7 @@ public void testMultipleBasePackagesWithDefaultsOnly() {
388388
GenericApplicationContext multiPackageContext = new GenericApplicationContext();
389389
ClassPathBeanDefinitionScanner multiPackageScanner = new ClassPathBeanDefinitionScanner(multiPackageContext);
390390
int singlePackageBeanCount = singlePackageScanner.scan(BASE_PACKAGE);
391-
assertEquals(12, singlePackageBeanCount);
391+
assertEquals(13, singlePackageBeanCount);
392392
multiPackageScanner.scan(BASE_PACKAGE, "org.springframework.dao.annotation");
393393
// assertTrue(multiPackageBeanCount > singlePackageBeanCount);
394394
}
@@ -399,7 +399,7 @@ public void testMultipleScanCalls() {
399399
ClassPathBeanDefinitionScanner scanner = new ClassPathBeanDefinitionScanner(context);
400400
int initialBeanCount = context.getBeanDefinitionCount();
401401
int scannedBeanCount = scanner.scan(BASE_PACKAGE);
402-
assertEquals(12, scannedBeanCount);
402+
assertEquals(13, scannedBeanCount);
403403
assertEquals(scannedBeanCount, context.getBeanDefinitionCount() - initialBeanCount);
404404
int addedBeanCount = scanner.scan("org.springframework.aop.aspectj.annotation");
405405
assertEquals(initialBeanCount + scannedBeanCount + addedBeanCount, context.getBeanDefinitionCount());
@@ -412,7 +412,7 @@ public void testBeanAutowiredWithAnnotationConfigEnabled() {
412412
ClassPathBeanDefinitionScanner scanner = new ClassPathBeanDefinitionScanner(context);
413413
scanner.setBeanNameGenerator(new TestBeanNameGenerator());
414414
int beanCount = scanner.scan(BASE_PACKAGE);
415-
assertEquals(12, beanCount);
415+
assertEquals(13, beanCount);
416416
context.refresh();
417417

418418
FooServiceImpl fooService = context.getBean("fooService", FooServiceImpl.class);
@@ -442,7 +442,7 @@ public void testBeanNotAutowiredWithAnnotationConfigDisabled() {
442442
scanner.setIncludeAnnotationConfig(false);
443443
scanner.setBeanNameGenerator(new TestBeanNameGenerator());
444444
int beanCount = scanner.scan(BASE_PACKAGE);
445-
assertEquals(6, beanCount);
445+
assertEquals(7, beanCount);
446446
context.refresh();
447447

448448
try {

0 commit comments

Comments
 (0)