|
1 | 1 | /*
|
2 |
| - * Copyright 2002-2020 the original author or authors. |
| 2 | + * Copyright 2002-2023 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.
|
@@ -207,10 +207,9 @@ public void testSimpleScanWithDefaultFiltersAndDefaultBeanNameClash() {
|
207 | 207 | ClassPathBeanDefinitionScanner scanner = new ClassPathBeanDefinitionScanner(context);
|
208 | 208 | scanner.setIncludeAnnotationConfig(false);
|
209 | 209 | scanner.scan("org.springframework.context.annotation3");
|
210 |
| - assertThatIllegalStateException().isThrownBy(() -> |
211 |
| - scanner.scan(BASE_PACKAGE)) |
212 |
| - .withMessageContaining("stubFooDao") |
213 |
| - .withMessageContaining(StubFooDao.class.getName()); |
| 210 | + assertThatIllegalStateException().isThrownBy(() -> scanner.scan(BASE_PACKAGE)) |
| 211 | + .withMessageContaining("stubFooDao") |
| 212 | + .withMessageContaining(StubFooDao.class.getName()); |
214 | 213 | }
|
215 | 214 |
|
216 | 215 | @Test
|
@@ -267,11 +266,10 @@ public void testSimpleScanWithDefaultFiltersAndSpecifiedBeanNameClash() {
|
267 | 266 | ClassPathBeanDefinitionScanner scanner = new ClassPathBeanDefinitionScanner(context);
|
268 | 267 | scanner.setIncludeAnnotationConfig(false);
|
269 | 268 | scanner.scan("org.springframework.context.annotation2");
|
270 |
| - assertThatIllegalStateException().isThrownBy(() -> |
271 |
| - scanner.scan(BASE_PACKAGE)) |
272 |
| - .withMessageContaining("myNamedDao") |
273 |
| - .withMessageContaining(NamedStubDao.class.getName()) |
274 |
| - .withMessageContaining(NamedStubDao2.class.getName()); |
| 269 | + assertThatIllegalStateException().isThrownBy(() -> scanner.scan(BASE_PACKAGE)) |
| 270 | + .withMessageContaining("myNamedDao") |
| 271 | + .withMessageContaining(NamedStubDao.class.getName()) |
| 272 | + .withMessageContaining(NamedStubDao2.class.getName()); |
275 | 273 | }
|
276 | 274 |
|
277 | 275 | @Test
|
|
0 commit comments