From cb0f26a1522aa2658eb048149c6bbfb7fe235ce3 Mon Sep 17 00:00:00 2001 From: Sam Brannen <104798+sbrannen@users.noreply.github.com> Date: Mon, 6 Oct 2025 13:54:42 +0200 Subject: [PATCH] Use consistent naming for Bean Override test classes cherry-picked from c6e5cfe03d59a6aec167150f950ffe002f188496 --- ...onTests.java => TestBeanByNameLookupIntegrationTests.java} | 2 +- ...onTests.java => TestBeanByTypeLookupIntegrationTests.java} | 2 +- ...ests.java => MockitoBeanByNameLookupIntegrationTests.java} | 2 +- ...ests.java => MockitoBeanByTypeLookupIntegrationTests.java} | 2 +- ...s.java => MockitoSpyBeanByNameLookupIntegrationTests.java} | 4 ++-- ...s.java => MockitoSpyBeanByTypeLookupIntegrationTests.java} | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) rename spring-test/src/test/java/org/springframework/test/context/bean/override/convention/{TestBeanForByNameLookupIntegrationTests.java => TestBeanByNameLookupIntegrationTests.java} (99%) rename spring-test/src/test/java/org/springframework/test/context/bean/override/convention/{TestBeanForByTypeLookupIntegrationTests.java => TestBeanByTypeLookupIntegrationTests.java} (98%) rename spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/{MockitoBeanForByNameLookupIntegrationTests.java => MockitoBeanByNameLookupIntegrationTests.java} (98%) rename spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/{MockitoBeanForByTypeLookupIntegrationTests.java => MockitoBeanByTypeLookupIntegrationTests.java} (98%) rename spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/{MockitoSpyBeanForByNameLookupIntegrationTests.java => MockitoSpyBeanByNameLookupIntegrationTests.java} (96%) rename spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/{MockitoSpyBeanForByTypeLookupIntegrationTests.java => MockitoSpyBeanByTypeLookupIntegrationTests.java} (98%) diff --git a/spring-test/src/test/java/org/springframework/test/context/bean/override/convention/TestBeanForByNameLookupIntegrationTests.java b/spring-test/src/test/java/org/springframework/test/context/bean/override/convention/TestBeanByNameLookupIntegrationTests.java similarity index 99% rename from spring-test/src/test/java/org/springframework/test/context/bean/override/convention/TestBeanForByNameLookupIntegrationTests.java rename to spring-test/src/test/java/org/springframework/test/context/bean/override/convention/TestBeanByNameLookupIntegrationTests.java index a0dc3d99eff..99192e9fcdd 100644 --- a/spring-test/src/test/java/org/springframework/test/context/bean/override/convention/TestBeanForByNameLookupIntegrationTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/bean/override/convention/TestBeanByNameLookupIntegrationTests.java @@ -35,7 +35,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @since 6.2 */ @SpringJUnitConfig -public class TestBeanForByNameLookupIntegrationTests { +public class TestBeanByNameLookupIntegrationTests { @TestBean(name = "field") String field; diff --git a/spring-test/src/test/java/org/springframework/test/context/bean/override/convention/TestBeanForByTypeLookupIntegrationTests.java b/spring-test/src/test/java/org/springframework/test/context/bean/override/convention/TestBeanByTypeLookupIntegrationTests.java similarity index 98% rename from spring-test/src/test/java/org/springframework/test/context/bean/override/convention/TestBeanForByTypeLookupIntegrationTests.java rename to spring-test/src/test/java/org/springframework/test/context/bean/override/convention/TestBeanByTypeLookupIntegrationTests.java index a1d95756496..790ec27eea1 100644 --- a/spring-test/src/test/java/org/springframework/test/context/bean/override/convention/TestBeanForByTypeLookupIntegrationTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/bean/override/convention/TestBeanByTypeLookupIntegrationTests.java @@ -37,7 +37,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @since 6.2 */ @SpringJUnitConfig -public class TestBeanForByTypeLookupIntegrationTests { +public class TestBeanByTypeLookupIntegrationTests { @TestBean MessageService messageService; diff --git a/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoBeanForByNameLookupIntegrationTests.java b/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoBeanByNameLookupIntegrationTests.java similarity index 98% rename from spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoBeanForByNameLookupIntegrationTests.java rename to spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoBeanByNameLookupIntegrationTests.java index d2f91dc6082..2fa39d4bbec 100644 --- a/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoBeanForByNameLookupIntegrationTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoBeanByNameLookupIntegrationTests.java @@ -40,7 +40,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @since 6.2 */ @SpringJUnitConfig -public class MockitoBeanForByNameLookupIntegrationTests { +public class MockitoBeanByNameLookupIntegrationTests { @MockitoBean("field") ExampleService field; diff --git a/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoBeanForByTypeLookupIntegrationTests.java b/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoBeanByTypeLookupIntegrationTests.java similarity index 98% rename from spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoBeanForByTypeLookupIntegrationTests.java rename to spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoBeanByTypeLookupIntegrationTests.java index 08fb1c4dfad..1f3be03c2a4 100644 --- a/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoBeanForByTypeLookupIntegrationTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoBeanByTypeLookupIntegrationTests.java @@ -47,7 +47,7 @@ import static org.springframework.test.mockito.MockitoAssertions.assertIsMock; * @since 6.2 */ @SpringJUnitConfig -public class MockitoBeanForByTypeLookupIntegrationTests { +public class MockitoBeanByTypeLookupIntegrationTests { @MockitoBean AnotherService serviceIsNotABean; diff --git a/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoSpyBeanForByNameLookupIntegrationTests.java b/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoSpyBeanByNameLookupIntegrationTests.java similarity index 96% rename from spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoSpyBeanForByNameLookupIntegrationTests.java rename to spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoSpyBeanByNameLookupIntegrationTests.java index af42d314bab..9c79e593318 100644 --- a/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoSpyBeanForByNameLookupIntegrationTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoSpyBeanByNameLookupIntegrationTests.java @@ -27,7 +27,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.context.bean.override.example.ExampleService; import org.springframework.test.context.bean.override.example.RealExampleService; -import org.springframework.test.context.bean.override.mockito.MockitoSpyBeanForByNameLookupIntegrationTests.Config; +import org.springframework.test.context.bean.override.mockito.MockitoSpyBeanByNameLookupIntegrationTests.Config; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import org.springframework.test.mockito.MockitoAssertions; @@ -41,7 +41,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @since 6.2 */ @SpringJUnitConfig(Config.class) -public class MockitoSpyBeanForByNameLookupIntegrationTests { +public class MockitoSpyBeanByNameLookupIntegrationTests { @MockitoSpyBean("field1") ExampleService field; diff --git a/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoSpyBeanForByTypeLookupIntegrationTests.java b/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoSpyBeanByTypeLookupIntegrationTests.java similarity index 98% rename from spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoSpyBeanForByTypeLookupIntegrationTests.java rename to spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoSpyBeanByTypeLookupIntegrationTests.java index 8cff403cf3b..8da2f3ba737 100644 --- a/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoSpyBeanForByTypeLookupIntegrationTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoSpyBeanByTypeLookupIntegrationTests.java @@ -42,7 +42,7 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; * @since 6.2 */ @SpringJUnitConfig -public class MockitoSpyBeanForByTypeLookupIntegrationTests { +public class MockitoSpyBeanByTypeLookupIntegrationTests { @MockitoSpyBean ExampleService anyNameForService;