Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.7.x' into 3.0.x

Browse Source 
Closes gh-37923
This commit is contained in:
Andy Wilkinson
2023-10-18 11:01:23 +01:00
parent 85c186a764 4cc3aec587
commit ece239f421
2 changed files with 41 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/ImportsContextCustomizerFactoryTests.java
View File

@@ -23,6 +23,7 @@ import org.junit.jupiter.api.Test;
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import org.springframework.stereotype.Component;
@@ -74,6 +75,20 @@ class ImportsContextCustomizerFactoryTests {
assertThat(customizer3).isEqualTo(customizer4);
}
@Test
void contextCustomizerEqualsAndHashCodeConsidersComponentScan() {
ContextCustomizer customizer1 = this.factory
.createContextCustomizer(TestWithImportAndComponentScanOfSomePackage.class, null);
ContextCustomizer customizer2 = this.factory
.createContextCustomizer(TestWithImportAndComponentScanOfSomePackage.class, null);
ContextCustomizer customizer3 = this.factory
.createContextCustomizer(TestWithImportAndComponentScanOfAnotherPackage.class, null);
assertThat(customizer1.hashCode()).isEqualTo(customizer2.hashCode());
assertThat(customizer1).isEqualTo(customizer2);
assertThat(customizer3.hashCode()).isNotEqualTo(customizer2.hashCode()).isNotEqualTo(customizer1.hashCode());
assertThat(customizer3).isNotEqualTo(customizer2).isNotEqualTo(customizer1);
}
@Test
void getContextCustomizerWhenClassHasBeanMethodsShouldThrowException() {
assertThatIllegalStateException()
@@ -105,6 +120,18 @@ class ImportsContextCustomizerFactoryTests {
}
@Import(ImportedBean.class)
@ComponentScan("some.package")
static class TestWithImportAndComponentScanOfSomePackage {
}
@Import(ImportedBean.class)
@ComponentScan("another.package")
static class TestWithImportAndComponentScanOfAnotherPackage {
}
@MetaImport
static class TestWithMetaImport {