|
|
|
|
@ -1,5 +1,5 @@
@@ -1,5 +1,5 @@
|
|
|
|
|
/* |
|
|
|
|
* Copyright 2002-2020 the original author or authors. |
|
|
|
|
* Copyright 2002-2023 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. |
|
|
|
|
@ -207,10 +207,9 @@ public class ClassPathBeanDefinitionScannerTests {
@@ -207,10 +207,9 @@ public class ClassPathBeanDefinitionScannerTests {
|
|
|
|
|
ClassPathBeanDefinitionScanner scanner = new ClassPathBeanDefinitionScanner(context); |
|
|
|
|
scanner.setIncludeAnnotationConfig(false); |
|
|
|
|
scanner.scan("org.springframework.context.annotation3"); |
|
|
|
|
assertThatIllegalStateException().isThrownBy(() -> |
|
|
|
|
scanner.scan(BASE_PACKAGE)) |
|
|
|
|
.withMessageContaining("stubFooDao") |
|
|
|
|
.withMessageContaining(StubFooDao.class.getName()); |
|
|
|
|
assertThatIllegalStateException().isThrownBy(() -> scanner.scan(BASE_PACKAGE)) |
|
|
|
|
.withMessageContaining("stubFooDao") |
|
|
|
|
.withMessageContaining(StubFooDao.class.getName()); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@Test |
|
|
|
|
@ -267,11 +266,10 @@ public class ClassPathBeanDefinitionScannerTests {
@@ -267,11 +266,10 @@ public class ClassPathBeanDefinitionScannerTests {
|
|
|
|
|
ClassPathBeanDefinitionScanner scanner = new ClassPathBeanDefinitionScanner(context); |
|
|
|
|
scanner.setIncludeAnnotationConfig(false); |
|
|
|
|
scanner.scan("org.springframework.context.annotation2"); |
|
|
|
|
assertThatIllegalStateException().isThrownBy(() -> |
|
|
|
|
scanner.scan(BASE_PACKAGE)) |
|
|
|
|
.withMessageContaining("myNamedDao") |
|
|
|
|
.withMessageContaining(NamedStubDao.class.getName()) |
|
|
|
|
.withMessageContaining(NamedStubDao2.class.getName()); |
|
|
|
|
assertThatIllegalStateException().isThrownBy(() -> scanner.scan(BASE_PACKAGE)) |
|
|
|
|
.withMessageContaining("myNamedDao") |
|
|
|
|
.withMessageContaining(NamedStubDao.class.getName()) |
|
|
|
|
.withMessageContaining(NamedStubDao2.class.getName()); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@Test |
|
|
|
|
|