Polishing

Author: sbrannen

spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoBeanAndAopProxyTests.java

@@ -40,15 +40,16 @@
 import static org.mockito.Mockito.verify;
 
 /**
- * Tests for {@link MockitoBean @MockitoBean} used in combination Spring AOP.
+ * Tests for {@link MockitoBean @MockitoBean} used in combination with Spring AOP.
  *
  * @author Sam Brannen
  * @author Phillip Webb
  * @since 6.2
  * @see <a href="https://github.com/spring-projects/spring-boot/issues/5837">5837</a>
+ * @see MockitoSpyBeanAndSpringAopProxyTests
  */
 @ExtendWith(SpringExtension.class)
-public class MockitoBeanAndSpringAopProxyTests {
+class MockitoBeanAndSpringAopProxyTests {
 
 	@MockitoBean
 	DateService dateService;
@@ -70,12 +71,12 @@ void mockShouldNotBeAnAopProxy() {
 		assertThat(Mockito.mockingDetails(dateService).isMock()).as("is Mockito mock").isTrue();
 
 		given(dateService.getDate(false)).willReturn(1L);
-		Long date1 = dateService.getDate(false);
-		assertThat(date1).isOne();
+		Long date = dateService.getDate(false);
+		assertThat(date).isOne();
 
 		given(dateService.getDate(false)).willReturn(2L);
-		Long date2 = dateService.getDate(false);
-		assertThat(date2).isEqualTo(2L);
+		date = dateService.getDate(false);
+		assertThat(date).isEqualTo(2L);
 
 		verify(dateService, times(2)).getDate(false);
 		verify(dateService, times(2)).getDate(eq(false));

spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoBeanAndSpringAopProxyTests.java

@@ -31,7 +31,6 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
-import org.springframework.stereotype.Service;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.test.util.AopTestUtils;
 
@@ -50,10 +49,10 @@
  * @author Phillip Webb
  * @since 6.2
  * @see <a href="https://github.com/spring-projects/spring-boot/issues/5837">5837</a>
- * @see MockitoBeanAndAopProxyTests
+ * @see MockitoBeanAndSpringAopProxyTests
  */
 @ExtendWith(SpringExtension.class)
-class MockitoSpyBeanAndAopProxyTests {
+class MockitoSpyBeanAndSpringAopProxyTests {
 
 	@MockitoSpyBean
 	DateService dateService;
@@ -161,7 +160,6 @@ ConcurrentMapCacheManager cacheManager() {
 		}
 	}
 
-	@Service
 	static class DateService {
 
 		@Cacheable("test")