diff --git a/spring-context/src/test/java/org/springframework/context/annotation/AnnotationConfigApplicationContextTests.java b/spring-context/src/test/java/org/springframework/context/annotation/AnnotationConfigApplicationContextTests.java index 0e7f8d39907..d544438c769 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/AnnotationConfigApplicationContextTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/AnnotationConfigApplicationContextTests.java @@ -56,7 +56,7 @@ class AnnotationConfigApplicationContextTests { context.getBean(uncapitalize(ComponentForScanning.class.getSimpleName())); context.getBean(uncapitalize(Jsr330NamedForScanning.class.getSimpleName())); Map beans = context.getBeansWithAnnotation(Configuration.class); - assertThat(beans).size().isEqualTo(1); + assertThat(beans).hasSize(1); } @Test @@ -68,7 +68,7 @@ class AnnotationConfigApplicationContextTests { context.getBean("testBean"); context.getBean("name"); Map beans = context.getBeansWithAnnotation(Configuration.class); - assertThat(beans).size().isEqualTo(2); + assertThat(beans).hasSize(2); } @Test @@ -80,7 +80,7 @@ class AnnotationConfigApplicationContextTests { context.getBean("testBean"); context.getBean("name"); Map beans = context.getBeansWithAnnotation(Configuration.class); - assertThat(beans).size().isEqualTo(2); + assertThat(beans).hasSize(2); } @Test diff --git a/spring-context/src/test/java/org/springframework/scheduling/config/ScheduledTaskRegistrarTests.java b/spring-context/src/test/java/org/springframework/scheduling/config/ScheduledTaskRegistrarTests.java index 14f49a37c31..9b9828c90e7 100644 --- a/spring-context/src/test/java/org/springframework/scheduling/config/ScheduledTaskRegistrarTests.java +++ b/spring-context/src/test/java/org/springframework/scheduling/config/ScheduledTaskRegistrarTests.java @@ -79,7 +79,7 @@ class ScheduledTaskRegistrarTests { @Test void addCronTaskWithValidExpression() { this.taskRegistrar.addCronTask(no_op, "* * * * * ?"); - assertThat(this.taskRegistrar.getCronTaskList()).size().isEqualTo(1); + assertThat(this.taskRegistrar.getCronTaskList()).hasSize(1); } @Test diff --git a/spring-test/src/test/java/org/springframework/test/context/event/CustomTestEventTests.java b/spring-test/src/test/java/org/springframework/test/context/event/CustomTestEventTests.java index 96b580c7934..e84e184c304 100644 --- a/spring-test/src/test/java/org/springframework/test/context/event/CustomTestEventTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/event/CustomTestEventTests.java @@ -57,7 +57,7 @@ public class CustomTestEventTests { @Test public void customTestEventPublished() { - assertThat(events).size().isEqualTo(1); + assertThat(events).hasSize(1); CustomEvent customEvent = events.get(0); assertThat(customEvent.getSource()).isEqualTo(getClass()); assertThat(customEvent.getTestName()).isEqualTo("customTestEventPublished"); diff --git a/spring-test/src/test/java/org/springframework/test/context/junit/jupiter/SpringExtensionParameterizedTests.java b/spring-test/src/test/java/org/springframework/test/context/junit/jupiter/SpringExtensionParameterizedTests.java index ac3cdaa0f34..ac2326febcc 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit/jupiter/SpringExtensionParameterizedTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit/jupiter/SpringExtensionParameterizedTests.java @@ -50,7 +50,7 @@ class SpringExtensionParameterizedTests { @ParameterizedTest @ValueSource(strings = { "Dilbert", "Wally" }) void people(String name, @Autowired List people) { - assertThat(people.stream().map(Person::getName).filter(name::equals)).size().isEqualTo(1); + assertThat(people.stream().map(Person::getName).filter(name::equals)).hasSize(1); } @ParameterizedTest diff --git a/spring-test/src/test/java/org/springframework/test/context/junit/jupiter/defaultmethods/GenericComicCharactersInterfaceDefaultMethodsTests.java b/spring-test/src/test/java/org/springframework/test/context/junit/jupiter/defaultmethods/GenericComicCharactersInterfaceDefaultMethodsTests.java index 3fc606cf726..5fdbafba293 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit/jupiter/defaultmethods/GenericComicCharactersInterfaceDefaultMethodsTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit/jupiter/defaultmethods/GenericComicCharactersInterfaceDefaultMethodsTests.java @@ -45,7 +45,7 @@ interface GenericComicCharactersInterfaceDefaultMethodsTests characters) { - assertThat(characters).as("Number of characters in context").size().isEqualTo(getExpectedNumCharacters()); + assertThat(characters).as("Number of characters in context").hasSize(getExpectedNumCharacters()); } @Test diff --git a/spring-test/src/test/java/org/springframework/test/context/junit/jupiter/generics/GenericComicCharactersTests.java b/spring-test/src/test/java/org/springframework/test/context/junit/jupiter/generics/GenericComicCharactersTests.java index dd2180d7529..3957d9a5b9c 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit/jupiter/generics/GenericComicCharactersTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit/jupiter/generics/GenericComicCharactersTests.java @@ -53,7 +53,7 @@ abstract class GenericComicCharactersTests { void autowiredFields() { assertThat(this.character).as("Character should have been @Autowired by Spring").isNotNull(); assertThat(this.character).as("character's name").extracting(Character::getName).isEqualTo(getExpectedName()); - assertThat(this.characters).as("Number of characters in context").size().isEqualTo(getExpectedNumCharacters()); + assertThat(this.characters).as("Number of characters in context").hasSize(getExpectedNumCharacters()); } @Test diff --git a/spring-web/src/test/java/org/springframework/web/accept/MappingMediaTypeFileExtensionResolverTests.java b/spring-web/src/test/java/org/springframework/web/accept/MappingMediaTypeFileExtensionResolverTests.java index 300dadf7e4a..873f521a9e7 100644 --- a/spring-web/src/test/java/org/springframework/web/accept/MappingMediaTypeFileExtensionResolverTests.java +++ b/spring-web/src/test/java/org/springframework/web/accept/MappingMediaTypeFileExtensionResolverTests.java @@ -41,7 +41,7 @@ public class MappingMediaTypeFileExtensionResolverTests { public void resolveExtensions() { List extensions = this.resolver.resolveFileExtensions(MediaType.APPLICATION_JSON); - assertThat(extensions).size().isEqualTo(1); + assertThat(extensions).hasSize(1); assertThat(extensions.get(0)).isEqualTo("json"); } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestScopedControllerAdviceIntegrationTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestScopedControllerAdviceIntegrationTests.java index 8669d4b64fc..84ae04c7b14 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestScopedControllerAdviceIntegrationTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestScopedControllerAdviceIntegrationTests.java @@ -51,7 +51,7 @@ class RequestScopedControllerAdviceIntegrationTests { assertThatCode(context::refresh).doesNotThrowAnyException(); List adviceBeans = ControllerAdviceBean.findAnnotatedBeans(context); - assertThat(adviceBeans).size().isEqualTo(1); + assertThat(adviceBeans).hasSize(1); assertThat(adviceBeans.get(0))// .returns(RequestScopedControllerAdvice.class, ControllerAdviceBean::getBeanType)// .returns(42, ControllerAdviceBean::getOrder);