Use consistent naming for Bean Override test classes

cherry-picked from c6e5cfe

Author: sbrannen

…BeanForByNameLookupIntegrationTests.java …estBeanByNameLookupIntegrationTests.javaspring-test/src/test/java/org/springframework/test/context/bean/override/convention/TestBeanForByNameLookupIntegrationTests.java renamed to spring-test/src/test/java/org/springframework/test/context/bean/override/convention/TestBeanByNameLookupIntegrationTests.java spring-test/src/test/java/org/springframework/test/context/bean/override/convention/TestBeanForByNameLookupIntegrationTests.java renamed to spring-test/src/test/java/org/springframework/test/context/bean/override/convention/TestBeanByNameLookupIntegrationTests.java

@@ -35,7 +35,7 @@
  * @since 6.2
  */
 @SpringJUnitConfig
-public class TestBeanForByNameLookupIntegrationTests {
+public class TestBeanByNameLookupIntegrationTests {
 
 	@TestBean(name = "field")
 	String field;

…BeanForByTypeLookupIntegrationTests.java …estBeanByTypeLookupIntegrationTests.javaspring-test/src/test/java/org/springframework/test/context/bean/override/convention/TestBeanForByTypeLookupIntegrationTests.java renamed to spring-test/src/test/java/org/springframework/test/context/bean/override/convention/TestBeanByTypeLookupIntegrationTests.java spring-test/src/test/java/org/springframework/test/context/bean/override/convention/TestBeanForByTypeLookupIntegrationTests.java renamed to spring-test/src/test/java/org/springframework/test/context/bean/override/convention/TestBeanByTypeLookupIntegrationTests.java

@@ -37,7 +37,7 @@
  * @since 6.2
  */
 @SpringJUnitConfig
-public class TestBeanForByTypeLookupIntegrationTests {
+public class TestBeanByTypeLookupIntegrationTests {
 
 	@TestBean
 	MessageService messageService;

…BeanForByNameLookupIntegrationTests.java …itoBeanByNameLookupIntegrationTests.javaspring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoBeanForByNameLookupIntegrationTests.java renamed to spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoBeanByNameLookupIntegrationTests.java spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoBeanForByNameLookupIntegrationTests.java renamed to spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoBeanByNameLookupIntegrationTests.java

@@ -40,7 +40,7 @@
  * @since 6.2
  */
 @SpringJUnitConfig
-public class MockitoBeanForByNameLookupIntegrationTests {
+public class MockitoBeanByNameLookupIntegrationTests {
 
 	@MockitoBean("field")
 	ExampleService field;

…BeanForByTypeLookupIntegrationTests.java …itoBeanByTypeLookupIntegrationTests.javaspring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoBeanForByTypeLookupIntegrationTests.java renamed to spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoBeanByTypeLookupIntegrationTests.java spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoBeanForByTypeLookupIntegrationTests.java renamed to spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoBeanByTypeLookupIntegrationTests.java

@@ -47,7 +47,7 @@
  * @since 6.2
  */
 @SpringJUnitConfig
-public class MockitoBeanForByTypeLookupIntegrationTests {
+public class MockitoBeanByTypeLookupIntegrationTests {
 
 	@MockitoBean
 	AnotherService serviceIsNotABean;

…BeanForByNameLookupIntegrationTests.java …SpyBeanByNameLookupIntegrationTests.javaspring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoSpyBeanForByNameLookupIntegrationTests.java renamed to spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoSpyBeanByNameLookupIntegrationTests.java spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoSpyBeanForByNameLookupIntegrationTests.java renamed to spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoSpyBeanByNameLookupIntegrationTests.java

@@ -27,7 +27,7 @@
 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 @@
  * @since 6.2
  */
 @SpringJUnitConfig(Config.class)
-public class MockitoSpyBeanForByNameLookupIntegrationTests {
+public class MockitoSpyBeanByNameLookupIntegrationTests {
 
 	@MockitoSpyBean("field1")
 	ExampleService field;

…BeanForByTypeLookupIntegrationTests.java …SpyBeanByTypeLookupIntegrationTests.javaspring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoSpyBeanForByTypeLookupIntegrationTests.java renamed to spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoSpyBeanByTypeLookupIntegrationTests.java spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoSpyBeanForByTypeLookupIntegrationTests.java renamed to spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoSpyBeanByTypeLookupIntegrationTests.java

@@ -42,7 +42,7 @@
  * @since 6.2
  */
 @SpringJUnitConfig
-public class MockitoSpyBeanForByTypeLookupIntegrationTests {
+public class MockitoSpyBeanByTypeLookupIntegrationTests {
 
 	@MockitoSpyBean
 	ExampleService anyNameForService;