Browse Source

Use consistent naming for Bean Override test classes

cherry-picked from c6e5cfe03d
pull/35687/head
Sam Brannen 2 months ago
parent
commit
cb0f26a152
  1. 2
      spring-test/src/test/java/org/springframework/test/context/bean/override/convention/TestBeanByNameLookupIntegrationTests.java
  2. 2
      spring-test/src/test/java/org/springframework/test/context/bean/override/convention/TestBeanByTypeLookupIntegrationTests.java
  3. 2
      spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoBeanByNameLookupIntegrationTests.java
  4. 2
      spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoBeanByTypeLookupIntegrationTests.java
  5. 4
      spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoSpyBeanByNameLookupIntegrationTests.java
  6. 2
      spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoSpyBeanByTypeLookupIntegrationTests.java

2
spring-test/src/test/java/org/springframework/test/context/bean/override/convention/TestBeanForByNameLookupIntegrationTests.java → 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 * @since 6.2
*/ */
@SpringJUnitConfig @SpringJUnitConfig
public class TestBeanForByNameLookupIntegrationTests { public class TestBeanByNameLookupIntegrationTests {
@TestBean(name = "field") @TestBean(name = "field")
String field; String field;

2
spring-test/src/test/java/org/springframework/test/context/bean/override/convention/TestBeanForByTypeLookupIntegrationTests.java → 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 * @since 6.2
*/ */
@SpringJUnitConfig @SpringJUnitConfig
public class TestBeanForByTypeLookupIntegrationTests { public class TestBeanByTypeLookupIntegrationTests {
@TestBean @TestBean
MessageService messageService; MessageService messageService;

2
spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoBeanForByNameLookupIntegrationTests.java → 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 * @since 6.2
*/ */
@SpringJUnitConfig @SpringJUnitConfig
public class MockitoBeanForByNameLookupIntegrationTests { public class MockitoBeanByNameLookupIntegrationTests {
@MockitoBean("field") @MockitoBean("field")
ExampleService field; ExampleService field;

2
spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoBeanForByTypeLookupIntegrationTests.java → 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 * @since 6.2
*/ */
@SpringJUnitConfig @SpringJUnitConfig
public class MockitoBeanForByTypeLookupIntegrationTests { public class MockitoBeanByTypeLookupIntegrationTests {
@MockitoBean @MockitoBean
AnotherService serviceIsNotABean; AnotherService serviceIsNotABean;

4
spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoSpyBeanForByNameLookupIntegrationTests.java → 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.context.annotation.Configuration;
import org.springframework.test.context.bean.override.example.ExampleService; 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.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.context.junit.jupiter.SpringJUnitConfig;
import org.springframework.test.mockito.MockitoAssertions; import org.springframework.test.mockito.MockitoAssertions;
@ -41,7 +41,7 @@ import static org.assertj.core.api.Assertions.assertThat;
* @since 6.2 * @since 6.2
*/ */
@SpringJUnitConfig(Config.class) @SpringJUnitConfig(Config.class)
public class MockitoSpyBeanForByNameLookupIntegrationTests { public class MockitoSpyBeanByNameLookupIntegrationTests {
@MockitoSpyBean("field1") @MockitoSpyBean("field1")
ExampleService field; ExampleService field;

2
spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoSpyBeanForByTypeLookupIntegrationTests.java → 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 * @since 6.2
*/ */
@SpringJUnitConfig @SpringJUnitConfig
public class MockitoSpyBeanForByTypeLookupIntegrationTests { public class MockitoSpyBeanByTypeLookupIntegrationTests {
@MockitoSpyBean @MockitoSpyBean
ExampleService anyNameForService; ExampleService anyNameForService;
Loading…
Cancel
Save