diff --git a/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoBeanSettingsLenientIntegrationTests.java b/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoBeanSettingsLenientIntegrationTests.java index 0122c7fd11..955292e299 100644 --- a/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoBeanSettingsLenientIntegrationTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoBeanSettingsLenientIntegrationTests.java @@ -19,11 +19,14 @@ package org.springframework.test.context.bean.override.mockito; import java.util.List; import org.junit.jupiter.api.Test; -import org.mockito.Mockito; import org.mockito.quality.Strictness; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.BDDMockito.when; +import static org.mockito.Mockito.mock; + /** * Integration tests for explicitly-defined {@link MockitoBeanSettings} with * lenient stubbing. @@ -38,8 +41,8 @@ class MockitoBeanSettingsLenientIntegrationTests { @Test @SuppressWarnings("rawtypes") void unusedStubbingNotReported() { - List list = Mockito.mock(List.class); - Mockito.when(list.get(Mockito.anyInt())).thenReturn(new Object()); + List list = mock(); + when(list.get(anyInt())).thenReturn(new Object()); } } diff --git a/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoMockBeanTests.java b/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoMockBeanTests.java index 472bec1c04..a6a905e637 100644 --- a/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoMockBeanTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoMockBeanTests.java @@ -42,8 +42,8 @@ class MockitoMockBeanTests { .isThrownBy(context::refresh) .withMessage(""" Unable to select a bean definition to override: found 2 bean definitions \ - of type %s (as required by annotated field '%s.example'): %s""".formatted( - String.class.getName(), ByTypeSingleLookup.class.getSimpleName(), List.of("bean1", "bean2"))); + of type %s (as required by annotated field '%s.example'): %s""", + String.class.getName(), ByTypeSingleLookup.class.getSimpleName(), List.of("bean1", "bean2")); } diff --git a/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoSpyBeanTests.java b/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoSpyBeanTests.java index d74e8b16e6..75b31761db 100644 --- a/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoSpyBeanTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoSpyBeanTests.java @@ -53,8 +53,8 @@ class MockitoSpyBeanTests { .isThrownBy(context::refresh) .withMessage(""" Unable to select a bean to override by wrapping: found 0 bean instances of \ - type %s (as required by annotated field '%s.example')""".formatted( - String.class.getName(), ByTypeSingleLookup.class.getSimpleName())); + type %s (as required by annotated field '%s.example')""", + String.class.getName(), ByTypeSingleLookup.class.getSimpleName()); } @Test @@ -67,8 +67,8 @@ class MockitoSpyBeanTests { .isThrownBy(context::refresh) .withMessage(""" Unable to select a bean to override by wrapping: found 2 bean instances \ - of type %s (as required by annotated field '%s.example'): %s""".formatted( - String.class.getName(), ByTypeSingleLookup.class.getSimpleName(), List.of("bean1", "bean2"))); + of type %s (as required by annotated field '%s.example'): %s""", + String.class.getName(), ByTypeSingleLookup.class.getSimpleName(), List.of("bean1", "bean2")); }