root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Updated bean count expectations in ClassPathBeanDefinitionScannerTests 

Issue: SPR-16152
This commit is contained in:
Juergen Hoeller 2017-11-06 18:36:29 +01:00
parent af2e296ff3
commit 9511d29adb
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
spring-context/src/test/java/org/springframework/context/annotation/ClassPathBeanDefinitionScannerTests.java
View File

@ -56,7 +56,7 @@ public class ClassPathBeanDefinitionScannerTests {
GenericApplicationContext context = new GenericApplicationContext(); GenericApplicationContext context = new GenericApplicationContext();
ClassPathBeanDefinitionScanner scanner = new ClassPathBeanDefinitionScanner(context); ClassPathBeanDefinitionScanner scanner = new ClassPathBeanDefinitionScanner(context);
int beanCount = scanner.scan(BASE_PACKAGE); int beanCount = scanner.scan(BASE_PACKAGE);
assertEquals(12, beanCount); assertEquals(13, beanCount);
assertTrue(context.containsBean("serviceInvocationCounter")); assertTrue(context.containsBean("serviceInvocationCounter"));
assertTrue(context.containsBean("fooServiceImpl")); assertTrue(context.containsBean("fooServiceImpl"));
assertTrue(context.containsBean("stubFooDao")); assertTrue(context.containsBean("stubFooDao"));
@ -105,7 +105,7 @@ public class ClassPathBeanDefinitionScannerTests {
GenericApplicationContext context = new GenericApplicationContext(); GenericApplicationContext context = new GenericApplicationContext();
ClassPathBeanDefinitionScanner scanner = new ClassPathBeanDefinitionScanner(context); ClassPathBeanDefinitionScanner scanner = new ClassPathBeanDefinitionScanner(context);
int beanCount = scanner.scan(BASE_PACKAGE); int beanCount = scanner.scan(BASE_PACKAGE);
assertEquals(12, beanCount); assertEquals(13, beanCount);
scanner.scan(BASE_PACKAGE); scanner.scan(BASE_PACKAGE);
assertTrue(context.containsBean("serviceInvocationCounter")); assertTrue(context.containsBean("serviceInvocationCounter"));
@ -122,7 +122,7 @@ public class ClassPathBeanDefinitionScannerTests {
ClassPathBeanDefinitionScanner scanner = new ClassPathBeanDefinitionScanner(context); ClassPathBeanDefinitionScanner scanner = new ClassPathBeanDefinitionScanner(context);
scanner.setIncludeAnnotationConfig(false); scanner.setIncludeAnnotationConfig(false);
int beanCount = scanner.scan(BASE_PACKAGE); int beanCount = scanner.scan(BASE_PACKAGE);
assertEquals(6, beanCount); assertEquals(7, beanCount);
assertTrue(context.containsBean("serviceInvocationCounter")); assertTrue(context.containsBean("serviceInvocationCounter"));
assertTrue(context.containsBean("fooServiceImpl")); assertTrue(context.containsBean("fooServiceImpl"));
@ -167,7 +167,7 @@ public class ClassPathBeanDefinitionScannerTests {
scanner.setIncludeAnnotationConfig(false); scanner.setIncludeAnnotationConfig(false);
int scannedBeanCount = scanner.scan(BASE_PACKAGE); int scannedBeanCount = scanner.scan(BASE_PACKAGE);
assertEquals(5, scannedBeanCount); assertEquals(6, scannedBeanCount);
assertEquals(initialBeanCount + scannedBeanCount, context.getBeanDefinitionCount()); assertEquals(initialBeanCount + scannedBeanCount, context.getBeanDefinitionCount());
assertTrue(context.containsBean("serviceInvocationCounter")); assertTrue(context.containsBean("serviceInvocationCounter"));
assertTrue(context.containsBean("fooServiceImpl")); assertTrue(context.containsBean("fooServiceImpl"));
@ -187,7 +187,7 @@ public class ClassPathBeanDefinitionScannerTests {
scanner.setIncludeAnnotationConfig(false); scanner.setIncludeAnnotationConfig(false);
int scannedBeanCount = scanner.scan(BASE_PACKAGE); int scannedBeanCount = scanner.scan(BASE_PACKAGE);
assertEquals(5, scannedBeanCount); assertEquals(6, scannedBeanCount);
assertEquals(initialBeanCount + scannedBeanCount, context.getBeanDefinitionCount()); assertEquals(initialBeanCount + scannedBeanCount, context.getBeanDefinitionCount());
assertTrue(context.containsBean("serviceInvocationCounter")); assertTrue(context.containsBean("serviceInvocationCounter"));
assertTrue(context.containsBean("fooServiceImpl")); assertTrue(context.containsBean("fooServiceImpl"));
@ -267,7 +267,7 @@ public class ClassPathBeanDefinitionScannerTests {
scanner.addIncludeFilter(new AnnotationTypeFilter(CustomComponent.class)); scanner.addIncludeFilter(new AnnotationTypeFilter(CustomComponent.class));
int beanCount = scanner.scan(BASE_PACKAGE); int beanCount = scanner.scan(BASE_PACKAGE);
assertEquals(13, beanCount); assertEquals(14, beanCount);
assertTrue(context.containsBean("messageBean")); assertTrue(context.containsBean("messageBean"));
assertTrue(context.containsBean("serviceInvocationCounter")); assertTrue(context.containsBean("serviceInvocationCounter"));
assertTrue(context.containsBean("fooServiceImpl")); assertTrue(context.containsBean("fooServiceImpl"));
@ -288,7 +288,7 @@ public class ClassPathBeanDefinitionScannerTests {
scanner.addExcludeFilter(new AnnotationTypeFilter(Aspect.class)); scanner.addExcludeFilter(new AnnotationTypeFilter(Aspect.class));
int beanCount = scanner.scan(BASE_PACKAGE); int beanCount = scanner.scan(BASE_PACKAGE);
assertEquals(11, beanCount); assertEquals(12, beanCount);
assertFalse(context.containsBean("serviceInvocationCounter")); assertFalse(context.containsBean("serviceInvocationCounter"));
assertTrue(context.containsBean("fooServiceImpl")); assertTrue(context.containsBean("fooServiceImpl"));
assertTrue(context.containsBean("stubFooDao")); assertTrue(context.containsBean("stubFooDao"));
@ -307,7 +307,7 @@ public class ClassPathBeanDefinitionScannerTests {
scanner.addExcludeFilter(new AssignableTypeFilter(FooService.class)); scanner.addExcludeFilter(new AssignableTypeFilter(FooService.class));
int beanCount = scanner.scan(BASE_PACKAGE); int beanCount = scanner.scan(BASE_PACKAGE);
assertEquals(11, beanCount); assertEquals(12, beanCount);
assertFalse(context.containsBean("fooServiceImpl")); assertFalse(context.containsBean("fooServiceImpl"));
assertTrue(context.containsBean("serviceInvocationCounter")); assertTrue(context.containsBean("serviceInvocationCounter"));
assertTrue(context.containsBean("stubFooDao")); assertTrue(context.containsBean("stubFooDao"));
@ -328,7 +328,7 @@ public class ClassPathBeanDefinitionScannerTests {
scanner.addExcludeFilter(new AssignableTypeFilter(FooService.class)); scanner.addExcludeFilter(new AssignableTypeFilter(FooService.class));
int beanCount = scanner.scan(BASE_PACKAGE); int beanCount = scanner.scan(BASE_PACKAGE);
assertEquals(5, beanCount); assertEquals(6, beanCount);
assertFalse(context.containsBean("fooServiceImpl")); assertFalse(context.containsBean("fooServiceImpl"));
assertTrue(context.containsBean("serviceInvocationCounter")); assertTrue(context.containsBean("serviceInvocationCounter"));
assertTrue(context.containsBean("stubFooDao")); assertTrue(context.containsBean("stubFooDao"));
@ -347,7 +347,7 @@ public class ClassPathBeanDefinitionScannerTests {
scanner.addExcludeFilter(new AnnotationTypeFilter(Aspect.class)); scanner.addExcludeFilter(new AnnotationTypeFilter(Aspect.class));
int beanCount = scanner.scan(BASE_PACKAGE); int beanCount = scanner.scan(BASE_PACKAGE);
assertEquals(10, beanCount); assertEquals(11, beanCount);
assertFalse(context.containsBean("fooServiceImpl")); assertFalse(context.containsBean("fooServiceImpl"));
assertFalse(context.containsBean("serviceInvocationCounter")); assertFalse(context.containsBean("serviceInvocationCounter"));
assertTrue(context.containsBean("stubFooDao")); assertTrue(context.containsBean("stubFooDao"));
@ -367,7 +367,7 @@ public class ClassPathBeanDefinitionScannerTests {
scanner.setBeanNameGenerator(new TestBeanNameGenerator()); scanner.setBeanNameGenerator(new TestBeanNameGenerator());
int beanCount = scanner.scan(BASE_PACKAGE); int beanCount = scanner.scan(BASE_PACKAGE);
assertEquals(12, beanCount); assertEquals(13, beanCount);
assertFalse(context.containsBean("fooServiceImpl")); assertFalse(context.containsBean("fooServiceImpl"));
assertTrue(context.containsBean("fooService")); assertTrue(context.containsBean("fooService"));
assertTrue(context.containsBean("serviceInvocationCounter")); assertTrue(context.containsBean("serviceInvocationCounter"));
@ -388,7 +388,7 @@ public class ClassPathBeanDefinitionScannerTests {
GenericApplicationContext multiPackageContext = new GenericApplicationContext(); GenericApplicationContext multiPackageContext = new GenericApplicationContext();
ClassPathBeanDefinitionScanner multiPackageScanner = new ClassPathBeanDefinitionScanner(multiPackageContext); ClassPathBeanDefinitionScanner multiPackageScanner = new ClassPathBeanDefinitionScanner(multiPackageContext);
int singlePackageBeanCount = singlePackageScanner.scan(BASE_PACKAGE); int singlePackageBeanCount = singlePackageScanner.scan(BASE_PACKAGE);
assertEquals(12, singlePackageBeanCount); assertEquals(13, singlePackageBeanCount);
multiPackageScanner.scan(BASE_PACKAGE, "org.springframework.dao.annotation"); multiPackageScanner.scan(BASE_PACKAGE, "org.springframework.dao.annotation");
// assertTrue(multiPackageBeanCount > singlePackageBeanCount); // assertTrue(multiPackageBeanCount > singlePackageBeanCount);
} }
@ -399,7 +399,7 @@ public class ClassPathBeanDefinitionScannerTests {
ClassPathBeanDefinitionScanner scanner = new ClassPathBeanDefinitionScanner(context); ClassPathBeanDefinitionScanner scanner = new ClassPathBeanDefinitionScanner(context);
int initialBeanCount = context.getBeanDefinitionCount(); int initialBeanCount = context.getBeanDefinitionCount();
int scannedBeanCount = scanner.scan(BASE_PACKAGE); int scannedBeanCount = scanner.scan(BASE_PACKAGE);
assertEquals(12, scannedBeanCount); assertEquals(13, scannedBeanCount);
assertEquals(scannedBeanCount, context.getBeanDefinitionCount() - initialBeanCount); assertEquals(scannedBeanCount, context.getBeanDefinitionCount() - initialBeanCount);
int addedBeanCount = scanner.scan("org.springframework.aop.aspectj.annotation"); int addedBeanCount = scanner.scan("org.springframework.aop.aspectj.annotation");
assertEquals(initialBeanCount + scannedBeanCount + addedBeanCount, context.getBeanDefinitionCount()); assertEquals(initialBeanCount + scannedBeanCount + addedBeanCount, context.getBeanDefinitionCount());
@ -412,7 +412,7 @@ public class ClassPathBeanDefinitionScannerTests {
ClassPathBeanDefinitionScanner scanner = new ClassPathBeanDefinitionScanner(context); ClassPathBeanDefinitionScanner scanner = new ClassPathBeanDefinitionScanner(context);
scanner.setBeanNameGenerator(new TestBeanNameGenerator()); scanner.setBeanNameGenerator(new TestBeanNameGenerator());
int beanCount = scanner.scan(BASE_PACKAGE); int beanCount = scanner.scan(BASE_PACKAGE);
assertEquals(12, beanCount); assertEquals(13, beanCount);
context.refresh(); context.refresh();
FooServiceImpl fooService = context.getBean("fooService", FooServiceImpl.class); FooServiceImpl fooService = context.getBean("fooService", FooServiceImpl.class);
@ -442,7 +442,7 @@ public class ClassPathBeanDefinitionScannerTests {
scanner.setIncludeAnnotationConfig(false); scanner.setIncludeAnnotationConfig(false);
scanner.setBeanNameGenerator(new TestBeanNameGenerator()); scanner.setBeanNameGenerator(new TestBeanNameGenerator());
int beanCount = scanner.scan(BASE_PACKAGE); int beanCount = scanner.scan(BASE_PACKAGE);
assertEquals(6, beanCount); assertEquals(7, beanCount);
context.refresh(); context.refresh();
try { try {