Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12182 from izeye

Browse Source 
* pr/12182:
  Rename TestRestTemplateTestContextCustomizer*
This commit is contained in:
Phillip Webb
2018-02-22 20:26:35 -08:00
parent cd5266ac03 680287635c
commit 358adcd6e3
5 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/web/client/TestRestTemplateTestContextCustomizer.java → spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/web/client/TestRestTemplateContextCustomizer.java
View File

@@ -42,12 +42,12 @@ import org.springframework.test.context.ContextCustomizer;
import org.springframework.test.context.MergedContextConfiguration;
/**
* {@link ContextCustomizer} for {@link SpringBootTest}.
* {@link ContextCustomizer} for {@link TestRestTemplate}.
*
* @author Phillip Webb
* @author Andy Wilkinson
*/
class TestRestTemplateTestContextCustomizer implements ContextCustomizer {
class TestRestTemplateContextCustomizer implements ContextCustomizer {
@Override
public void customizeContext(ConfigurableApplicationContext context,

8
spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/web/client/TestRestTemplateTestContextCustomizerFactory.java → spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/web/client/TestRestTemplateContextCustomizerFactory.java
View File

@@ -25,19 +25,19 @@ import org.springframework.test.context.ContextCustomizer;
import org.springframework.test.context.ContextCustomizerFactory;
/**
* {@link ContextCustomizerFactory} for {@link SpringBootTest}.
* {@link ContextCustomizerFactory} for {@link TestRestTemplate}.
*
* @author Andy Wilkinson
* @see TestRestTemplateTestContextCustomizer
* @see TestRestTemplateContextCustomizer
*/
class TestRestTemplateTestContextCustomizerFactory implements ContextCustomizerFactory {
class TestRestTemplateContextCustomizerFactory implements ContextCustomizerFactory {
@Override
public ContextCustomizer createContextCustomizer(Class<?> testClass,
List<ContextConfigurationAttributes> configAttributes) {
if (AnnotatedElementUtils.findMergedAnnotation(testClass,
SpringBootTest.class) != null) {
return new TestRestTemplateTestContextCustomizer();
return new TestRestTemplateContextCustomizer();
}
return null;
}

2
spring-boot-project/spring-boot-test/src/main/resources/META-INF/spring.factories
View File

@@ -4,7 +4,7 @@ org.springframework.boot.test.context.ImportsContextCustomizerFactory,\
org.springframework.boot.test.context.filter.ExcludeFilterContextCustomizerFactory,\
org.springframework.boot.test.json.DuplicateJsonObjectContextCustomizerFactory,\
org.springframework.boot.test.mock.mockito.MockitoContextCustomizerFactory,\
org.springframework.boot.test.web.client.TestRestTemplateTestContextCustomizerFactory,\
org.springframework.boot.test.web.client.TestRestTemplateContextCustomizerFactory,\
org.springframework.boot.test.web.reactive.server.WebTestClientContextCustomizerFactory
# Test Execution Listeners

4
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/TestRestTemplateTestContextCustomizerIntegrationTests.java → spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/TestRestTemplateContextCustomizerIntegrationTests.java
View File

@@ -40,14 +40,14 @@ import org.springframework.test.context.junit4.SpringRunner;
import static org.assertj.core.api.Assertions.assertThat;
/**
* Integration test for {@link TestRestTemplateTestContextCustomizer}.
* Integration tests for {@link TestRestTemplateContextCustomizer}.
*
* @author Phillip Webb
*/
@RunWith(SpringRunner.class)
@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
@DirtiesContext
public class TestRestTemplateTestContextCustomizerIntegrationTests {
public class TestRestTemplateContextCustomizerIntegrationTests {
@Autowired
private TestRestTemplate restTemplate;

4
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/TestRestTemplateTestContextCustomizerWithOverrideIntegrationTests.java → spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/TestRestTemplateContextCustomizerWithOverrideIntegrationTests.java
View File

@@ -40,7 +40,7 @@ import org.springframework.test.context.junit4.SpringRunner;
import static org.assertj.core.api.Assertions.assertThat;
/**
* Integration test for {@link TestRestTemplateTestContextCustomizer} with a custom
* Integration tests for {@link TestRestTemplateContextCustomizer} with a custom
* {@link TestRestTemplate} bean.
*
* @author Phillip Webb
@@ -48,7 +48,7 @@ import static org.assertj.core.api.Assertions.assertThat;
@RunWith(SpringRunner.class)
@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
@DirtiesContext
public class TestRestTemplateTestContextCustomizerWithOverrideIntegrationTests {
public class TestRestTemplateContextCustomizerWithOverrideIntegrationTests {
@Autowired
private TestRestTemplate restTemplate;