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

Merge branch '2.6.x' into 2.7.x

Browse Source 
Closes gh-29176
This commit is contained in:
Stephane Nicoll
2021-12-27 12:02:57 +01:00
parent eb81cbf053 576eb50ed8
commit 2b140950e3
10 changed files with 39 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/ImportsContextCustomizerTests.java
View File

@@ -75,9 +75,9 @@ class ImportsContextCustomizerTests {
}
@Test
void customizersForTestClassesWithDifferentJunitAnnotationsAreEqual() {
assertThat(new ImportsContextCustomizer(FirstJunitAnnotatedTestClass.class))
.isEqualTo(new ImportsContextCustomizer(SecondJunitAnnotatedTestClass.class));
void customizersForTestClassesWithDifferentJUnitAnnotationsAreEqual() {
assertThat(new ImportsContextCustomizer(FirstJUnitAnnotatedTestClass.class))
.isEqualTo(new ImportsContextCustomizer(SecondJUnitAnnotatedTestClass.class));
}
@Import(TestImportSelector.class)
@@ -142,13 +142,13 @@ class ImportsContextCustomizerTests {
@Nested
@Import(TestImportSelector.class)
static class FirstJunitAnnotatedTestClass {
static class FirstJUnitAnnotatedTestClass {
}
@Tag("test")
@Import(TestImportSelector.class)
static class SecondJunitAnnotatedTestClass {
static class SecondJUnitAnnotatedTestClass {
}